diff options
| author |   Aaro Koskinen <aaro.koskinen@nokia.com> | 2009-12-09 17:26:25 +0100 |
|---|---|---|
| committer |   Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-12 12:46:09 +0200 |
| commit | 92fe0ff16a9299233104187bd6ceb2101501badc (patch) | |
| tree | 31d58e8b8b89f7a5e71ac831e03fd62f8d9269f3 /drivers/video/omap2/displays | |
| parent | OMAP: 3430SDP: remove vdvi regulator (diff) | |
| download | linux-dev-92fe0ff16a9299233104187bd6ceb2101501badc.tar.xz linux-dev-92fe0ff16a9299233104187bd6ceb2101501badc.zip | |
OMAP: DSS: Taal: fix error returns in taal_probe()
The workqueue creation error branch attempted to destroy a NULL wq,
and, in turn, a failed registration does not destroy the newly created
workqueue.
The problem was reported by a static analysis tool.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/displays')
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 1f01dfc5e52e..0aaaa8a8e0f5 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -510,7 +510,7 @@ static int taal_probe(struct omap_dss_device *dssdev) if (td->esd_wq == NULL) { dev_err(&dssdev->dev, "can't create ESD workqueue\n"); r = -ENOMEM; - goto err2; + goto err1; } INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work); @@ -528,7 +528,7 @@ static int taal_probe(struct omap_dss_device *dssdev) &taal_bl_ops); if (IS_ERR(bldev)) { r = PTR_ERR(bldev); - goto err1; + goto err2; } td->bldev = bldev; |