dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

OMAP: DSS2: Taal: Change probe error handling labels 

Switch from numbered to named labels to make it easier to add new
labels for error handling.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
Jani Nikula 2010-04-15 12:24:36 +03:00 committed by Tomi Valkeinen
parent 4571a023f5
commit d2b6578738
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/omap2/displays/panel-taal.c
View File

@ -539,7 +539,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
td = kzalloc(sizeof(*td), GFP_KERNEL);
if (!td) {
r = -ENOMEM;
goto err0;
goto err;
}
td->dssdev = dssdev;
@ -549,7 +549,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 err1;
goto err_wq;
}
INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
@ -571,7 +571,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
&taal_bl_ops, &props);
if (IS_ERR(bldev)) {
r = PTR_ERR(bldev);
goto err2;
goto err_bl;
}
td->bldev = bldev;
@ -591,7 +591,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
r = gpio_request(gpio, "taal irq");
if (r) {
dev_err(&dssdev->dev, "GPIO request failed\n");
goto err3;
goto err_gpio;
}
gpio_direction_input(gpio);
@ -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 err4;
goto err_irq;
}
init_completion(&td->te_completion);
@ -614,23 +614,23 @@ 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 err5;
goto err_sysfs;
}
return 0;
err5:
err_sysfs:
if (td->use_ext_te)
free_irq(gpio_to_irq(dssdev->phy.dsi.ext_te_gpio), dssdev);
err4:
err_irq:
if (td->use_ext_te)
gpio_free(dssdev->phy.dsi.ext_te_gpio);
err3:
err_gpio:
backlight_device_unregister(bldev);
err2:
err_bl:
destroy_workqueue(td->esd_wq);
err1:
err_wq:
kfree(td);
err0:
err:
return r;
}