video: backlight/progear, fix pci device refcounting

Stanse found an ommitted pci_dev_puts on error path in progearbl_probe.
pmu_dev and sb_dev are gotten, but never put when
backlight_device_register fails.

So unify fail paths and put the devs when the failure occurs.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 075786e05034cc5defba6606a32e13b2e18f8de6..2ec16deb2397763d34003a0ba9a491a57deb7fd5 100644 (file)
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -63,6 +63,7 @@ static int progearbl_probe(struct platform_device *pdev)
 {
        u8 temp;
        struct backlight_device *progear_backlight_device;
+       int ret;
 
        pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
        if (!pmu_dev) {
@@ -73,8 +74,8 @@ static int progearbl_probe(struct platform_device *pdev)
        sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
        if (!sb_dev) {
                printk("ALI 1533 SB not found.\n");
-               pci_dev_put(pmu_dev);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto put_pmu;
        }
 
        /*     Set SB_MPS1 to enable brightness control. */
@@ -84,8 +85,10 @@ static int progearbl_probe(struct platform_device *pdev)
        progear_backlight_device = backlight_device_register("progear-bl",
                                                             &pdev->dev, NULL,
                                                             &progearbl_ops);
-       if (IS_ERR(progear_backlight_device))
-               return PTR_ERR(progear_backlight_device);
+       if (IS_ERR(progear_backlight_device)) {
+               ret = PTR_ERR(progear_backlight_device);
+               goto put_sb;
+       }
 
        platform_set_drvdata(pdev, progear_backlight_device);
 
@@ -95,6 +98,11 @@ static int progearbl_probe(struct platform_device *pdev)
        progearbl_set_intensity(progear_backlight_device);
 
        return 0;
+put_sb:
+       pci_dev_put(sb_dev);
+put_pmu:
+       pci_dev_put(pmu_dev);
+       return ret;
 }
 
 static int progearbl_remove(struct platform_device *pdev)