aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/displays/panel-taal.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 383003ca092d..2f8967874680 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -539,7 +539,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
539 td = kzalloc(sizeof(*td), GFP_KERNEL); 539 td = kzalloc(sizeof(*td), GFP_KERNEL);
540 if (!td) { 540 if (!td) {
541 r = -ENOMEM; 541 r = -ENOMEM;
542 goto err0; 542 goto err;
543 } 543 }
544 td->dssdev = dssdev; 544 td->dssdev = dssdev;
545 545
@@ -549,7 +549,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
549 if (td->esd_wq == NULL) { 549 if (td->esd_wq == NULL) {
550 dev_err(&dssdev->dev, "can't create ESD workqueue\n"); 550 dev_err(&dssdev->dev, "can't create ESD workqueue\n");
551 r = -ENOMEM; 551 r = -ENOMEM;
552 goto err1; 552 goto err_wq;
553 } 553 }
554 INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work); 554 INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
555 555
@@ -571,7 +571,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
571 &taal_bl_ops, &props); 571 &taal_bl_ops, &props);
572 if (IS_ERR(bldev)) { 572 if (IS_ERR(bldev)) {
573 r = PTR_ERR(bldev); 573 r = PTR_ERR(bldev);
574 goto err2; 574 goto err_bl;
575 } 575 }
576 576
577 td->bldev = bldev; 577 td->bldev = bldev;
@@ -591,7 +591,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
591 r = gpio_request(gpio, "taal irq"); 591 r = gpio_request(gpio, "taal irq");
592 if (r) { 592 if (r) {
593 dev_err(&dssdev->dev, "GPIO request failed\n"); 593 dev_err(&dssdev->dev, "GPIO request failed\n");
594 goto err3; 594 goto err_gpio;
595 } 595 }
596 596
597 gpio_direction_input(gpio); 597 gpio_direction_input(gpio);
@@ -603,7 +603,7 @@ static int taal_probe(struct omap_dss_device *dssdev)
603 if (r) { 603 if (r) {
604 dev_err(&dssdev->dev, "IRQ request failed\n"); 604 dev_err(&dssdev->dev, "IRQ request failed\n");
605 gpio_free(gpio); 605 gpio_free(gpio);
606 goto err4; 606 goto err_irq;
607 } 607 }
608 608
609 init_completion(&td->te_completion); 609 init_completion(&td->te_completion);
@@ -614,23 +614,23 @@ static int taal_probe(struct omap_dss_device *dssdev)
614 r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group); 614 r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group);
615 if (r) { 615 if (r) {
616 dev_err(&dssdev->dev, "failed to create sysfs files\n"); 616 dev_err(&dssdev->dev, "failed to create sysfs files\n");
617 goto err5; 617 goto err_sysfs;
618 } 618 }
619 619
620 return 0; 620 return 0;
621err5: 621err_sysfs:
622 if (td->use_ext_te) 622 if (td->use_ext_te)
623 free_irq(gpio_to_irq(dssdev->phy.dsi.ext_te_gpio), dssdev); 623 free_irq(gpio_to_irq(dssdev->phy.dsi.ext_te_gpio), dssdev);
624err4: 624err_irq:
625 if (td->use_ext_te) 625 if (td->use_ext_te)
626 gpio_free(dssdev->phy.dsi.ext_te_gpio); 626 gpio_free(dssdev->phy.dsi.ext_te_gpio);
627err3: 627err_gpio:
628 backlight_device_unregister(bldev); 628 backlight_device_unregister(bldev);
629err2: 629err_bl:
630 destroy_workqueue(td->esd_wq); 630 destroy_workqueue(td->esd_wq);
631err1: 631err_wq:
632 kfree(td); 632 kfree(td);
633err0: 633err:
634 return r; 634 return r;
635} 635}
636 636