diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:24 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-18 17:24:41 +0000 |
commit | d1c8b1bd093cb57860fb6446e096e1c1cda92d4d (patch) | |
tree | 9c93ddf1ced6064a7f75a3f8a3691d09e624edb9 /drivers/video/omap2 | |
parent | d13733f4a24d93c582f22f17b5434cf195b7d505 (diff) | |
parent | 1b1ccee1e821e59c2a45c95b007aeb2c9dafd9be (diff) | |
download | blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.tar.gz blackbird-op-linux-d1c8b1bd093cb57860fb6446e096e1c1cda92d4d.zip |
Merge tag 's2mps11-build' into regulator-s5m8767 since a following patch
depend on it.
regulator/clk: Fix s2mps11 build
This patch fixes a build failure that appeared in v3.13-rc4 due to an
RTC/MFD update merged via -mm.
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r-- | drivers/video/omap2/displays-new/panel-sony-acx565akm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c index e6d56f714ae4..d94f35dbd536 100644 --- a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c +++ b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c @@ -526,6 +526,8 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev) struct omap_dss_device *in = ddata->in; int r; + mutex_lock(&ddata->mutex); + dev_dbg(&ddata->spi->dev, "%s\n", __func__); in->ops.sdi->set_timings(in, &ddata->videomode); @@ -614,10 +616,7 @@ static int acx565akm_enable(struct omap_dss_device *dssdev) if (omapdss_device_is_enabled(dssdev)) return 0; - mutex_lock(&ddata->mutex); r = acx565akm_panel_power_on(dssdev); - mutex_unlock(&ddata->mutex); - if (r) return r; |