Merge 3.10-rc3 into char-misc-next

We want the changes in here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index df0b69987914..2ebd6ce46108 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1414,14 +1414,18 @@ static int abituguru_probe(struct platform_device *pdev)
         pr_info("found Abit uGuru\n");
 
         /* Register sysfs hooks */
-        for (i = 0; i < sysfs_attr_i; i++)
-                if (device_create_file(&pdev->dev,
-                                &data->sysfs_attr[i].dev_attr))
+        for (i = 0; i < sysfs_attr_i; i++) {
+                res = device_create_file(&pdev->dev,
+                                         &data->sysfs_attr[i].dev_attr);
+                if (res)
                         goto abituguru_probe_error;
-        for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
-                if (device_create_file(&pdev->dev,
-                                &abituguru_sysfs_attr[i].dev_attr))
+        }
+        for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) {
+                res = device_create_file(&pdev->dev,
+                                         &abituguru_sysfs_attr[i].dev_attr);
+                if (res)
                         goto abituguru_probe_error;
+        }
 
         data->hwmon_dev = hwmon_device_register(&pdev->dev);
         if (!IS_ERR(data->hwmon_dev))