projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'omap_dss2/for-next'
[deliverable/linux.git]
/
drivers
/
video
/
fbdev
/
omap2
/
omapfb
/
dss
/
hdmi4.c
diff --git
a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index 926a6f20dbb233ea541dc2dbbd1e90c0484e3a1a..156a254705ea5e090bbd1e3c1915adb96264e238 100644
(file)
--- a/
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@
-100,7
+100,6
@@
static irqreturn_t hdmi_irq_handler(int irq, void *data)
static int hdmi_init_regulator(void)
{
static int hdmi_init_regulator(void)
{
- int r;
struct regulator *reg;
if (hdmi.vdda_reg != NULL)
struct regulator *reg;
if (hdmi.vdda_reg != NULL)
@@
-114,13
+113,6
@@
static int hdmi_init_regulator(void)
return PTR_ERR(reg);
}
return PTR_ERR(reg);
}
- r = regulator_set_voltage(reg, 1800000, 1800000);
- if (r) {
- devm_regulator_put(reg);
- DSSWARN("can't set the regulator voltage\n");
- return r;
- }
-
hdmi.vdda_reg = reg;
return 0;
hdmi.vdda_reg = reg;
return 0;
This page took
0.025126 seconds
and
5
git commands to generate.