diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2010-08-18 13:22:28 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:53 -0600 |
| commit | a77c874f9b85691ea4af5362e2b5c9fc55a76acc (patch) | |
| tree | 6e911eef3a565c2ffa8b284210586793ad5c8ce9 /drivers/video/mcde/display-generic_dsi.c | |
| parent | e43925f4db29bd19a8907b0cba1adde455f07a34 (diff) | |
MCDE Fixes: Added http://gerrit.lud.stericsson.com/gerrit/#change,3792 patchset Added patch set: http://gerrit.lud.stericsson.com/gerrit/#change,3751 Enabled single buffered fb in config.
Change-Id: I59ed2dcd1d45f896177f0f3be425b158f03fd0ee
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/4097
Tested-by: Robert MARKLUND <robert.marklund@stericsson.com>
Reviewed-by: Robert ROSENGREN <robert.rosengren@stericsson.com>
Diffstat (limited to 'drivers/video/mcde/display-generic_dsi.c')
| -rw-r--r-- | drivers/video/mcde/display-generic_dsi.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/video/mcde/display-generic_dsi.c b/drivers/video/mcde/display-generic_dsi.c index 15b8ccec59a..d445d806a6a 100644 --- a/drivers/video/mcde/display-generic_dsi.c +++ b/drivers/video/mcde/display-generic_dsi.c @@ -13,24 +13,23 @@ #include <linux/device.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/err.h> #include <video/mcde_display.h> #include <video/mcde_display-generic_dsi.h> static int generic_platform_enable(struct mcde_display_device *dev) { - int ret = 0; struct mcde_display_generic_platform_data *pdata = dev->dev.platform_data; dev_dbg(&dev->dev, "%s: Reset & power on generic display\n", __func__); if (pdata->regulator) { - ret = regulator_enable(pdata->regulator); - if (ret < 0) { + if (regulator_enable(pdata->regulator) < 0) { dev_err(&dev->dev, "%s:Failed to enable regulator\n" , __func__); - goto out; + return -EINVAL; } } if (pdata->reset_gpio) @@ -39,24 +38,24 @@ static int generic_platform_enable(struct mcde_display_device *dev) if (pdata->reset_gpio) gpio_set_value(pdata->reset_gpio, !pdata->reset_high); out: - return ret; + return 0; } static int generic_platform_disable(struct mcde_display_device *dev) { - int ret = 0; struct mcde_display_generic_platform_data *pdata = dev->dev.platform_data; dev_dbg(&dev->dev, "%s:Reset & power off generic display\n", __func__); if (pdata->regulator) { - ret = regulator_disable(pdata->regulator); - if (ret < 0) + if (regulator_disable(pdata->regulator) < 0) { dev_err(&dev->dev, "%s:Failed to disable regulator\n" , __func__); + return -EINVAL; + } } - return ret; + return 0; } static int __devinit generic_probe(struct mcde_display_device *dev) |