diff options
| -rw-r--r-- | drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c index b88e1ddce229..d8ce20d2fbda 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | |||
| @@ -639,7 +639,8 @@ static int vpfe_probe(struct platform_device *pdev) | |||
| 639 | if (ret) | 639 | if (ret) |
| 640 | goto probe_free_dev_mem; | 640 | goto probe_free_dev_mem; |
| 641 | 641 | ||
| 642 | if (vpfe_initialize_modules(vpfe_dev, pdev)) | 642 | ret = vpfe_initialize_modules(vpfe_dev, pdev); |
| 643 | if (ret) | ||
| 643 | goto probe_disable_clock; | 644 | goto probe_disable_clock; |
| 644 | 645 | ||
| 645 | vpfe_dev->media_dev.dev = vpfe_dev->pdev; | 646 | vpfe_dev->media_dev.dev = vpfe_dev->pdev; |
| @@ -663,7 +664,8 @@ static int vpfe_probe(struct platform_device *pdev) | |||
| 663 | /* set the driver data in platform device */ | 664 | /* set the driver data in platform device */ |
| 664 | platform_set_drvdata(pdev, vpfe_dev); | 665 | platform_set_drvdata(pdev, vpfe_dev); |
| 665 | /* register subdevs/entities */ | 666 | /* register subdevs/entities */ |
| 666 | if (vpfe_register_entities(vpfe_dev)) | 667 | ret = vpfe_register_entities(vpfe_dev); |
| 668 | if (ret) | ||
| 667 | goto probe_out_v4l2_unregister; | 669 | goto probe_out_v4l2_unregister; |
| 668 | 670 | ||
| 669 | ret = vpfe_attach_irq(vpfe_dev); | 671 | ret = vpfe_attach_irq(vpfe_dev); |
