Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  fix setattr error handling in sysfs, configfs
  kobject: free memory if netlink_kernel_create() fails
  lib/kobject_uevent.c: fix CONIG_NET=n warning

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index bde1a4c3679a..0835a3b70e03 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -117,11 +117,13 @@ int sysfs_setattr(struct dentry *dentry, struct iattr *iattr)
         if (error)
                 goto out;
 
+        error = sysfs_sd_setattr(sd, iattr);
+        if (error)
+                goto out;
+
         /* this ignores size changes */
         generic_setattr(inode, iattr);
 
-        error = sysfs_sd_setattr(sd, iattr);
-
 out:
         mutex_unlock(&sysfs_mutex);
         return error;