diff options
| author | Jani Nikula <ext-jani.1.nikula@nokia.com> | 2010-04-09 13:52:33 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-08-03 15:18:47 +0300 |
| commit | 2f1e5f606a1330fa9d1d89e88670c3dec7fbe36f (patch) | |
| tree | 2231dc81153195f33e1d056d3196fdb158e6fe17 /drivers/video/omap2/displays/panel-taal.c | |
| parent | 75392bfe3ecc8dc89acf2165a34f8aa039346fb4 (diff) | |
| download | linux-stable-2f1e5f606a1330fa9d1d89e88670c3dec7fbe36f.tar.gz linux-stable-2f1e5f606a1330fa9d1d89e88670c3dec7fbe36f.tar.bz2 linux-stable-2f1e5f606a1330fa9d1d89e88670c3dec7fbe36f.zip | |
OMAP: DSS2: Taal: Fix request_irq() error handling
Separate gpio_request() and request_irq() error handling.
Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/displays/panel-taal.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 3421be3d85da..af0750e91a5d 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -603,7 +603,7 @@ static int taal_probe(struct omap_dss_device *dssdev) if (r) { dev_err(&dssdev->dev, "IRQ request failed\n"); gpio_free(gpio); - goto err3; + goto err4; } init_completion(&td->te_completion); @@ -614,16 +614,16 @@ static int taal_probe(struct omap_dss_device *dssdev) r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group); if (r) { dev_err(&dssdev->dev, "failed to create sysfs files\n"); - goto err4; + goto err5; } return 0; +err5: + if (td->use_ext_te) + free_irq(gpio_to_irq(dssdev->phy.dsi.ext_te_gpio), dssdev); err4: - if (td->use_ext_te) { - int gpio = dssdev->phy.dsi.ext_te_gpio; - free_irq(gpio_to_irq(gpio), dssdev); - gpio_free(gpio); - } + if (td->use_ext_te) + gpio_free(dssdev->phy.dsi.ext_te_gpio); err3: backlight_device_unregister(bldev); err2: |