Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / mfd / ab3100-otp.c

diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c
index 63d2b72..8440010 100644 (file)
--- a/drivers/mfd/ab3100-otp.c
+++ b/drivers/mfd/ab3100-otp.c
@@ -199,7 +199,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
 
        err = ab3100_otp_read(otp);
        if (err)
-               return err;
+               goto err_otp_read;
 
        dev_info(&pdev->dev, "AB3100 OTP readout registered\n");
 
@@ -208,21 +208,21 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
                err = device_create_file(&pdev->dev,
                                         &ab3100_otp_attrs[i]);
                if (err)
-                       goto out_no_sysfs;
+                       goto err_create_file;
        }
 
        /* debugfs entries */
        err = ab3100_otp_init_debugfs(&pdev->dev, otp);
        if (err)
-               goto out_no_debugfs;
+               goto err_init_debugfs;
 
        return 0;
 
-out_no_sysfs:
-       for (i = 0; i < ARRAY_SIZE(ab3100_otp_attrs); i++)
-               device_remove_file(&pdev->dev,
-                                  &ab3100_otp_attrs[i]);
-out_no_debugfs:
+err_init_debugfs:
+err_create_file:
+       while (--i >= 0)
+               device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]);
+err_otp_read:
        kfree(otp);
        return err;
 }