diff --git a/[refs] b/[refs]
index a2c0e453122d..d145da46a98a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a88a068710910aa9a303bc061f405b0768fef80
+refs/heads/master: 6a56486716d54d2c16c46cde6a5cf10062cd6719
diff --git a/trunk/drivers/staging/speakup/kobjects.c b/trunk/drivers/staging/speakup/kobjects.c
index e12b0e7c0ad6..cc79f9edfe9e 100644
--- a/trunk/drivers/staging/speakup/kobjects.c
+++ b/trunk/drivers/staging/speakup/kobjects.c
@@ -989,24 +989,34 @@ int speakup_kobj_init(void)
 
 	speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj);
 	if (!speakup_kobj) {
-		kobject_put(accessibility_kobj);
-		return -ENOMEM;
+		retval = -ENOMEM;
+		goto err_acc;
 	}
 
 	/* Create the files associated with this kobject */
 	retval = sysfs_create_group(speakup_kobj, &main_attr_group);
 	if (retval)
-		speakup_kobj_exit();
+		goto err_speakup;
 
 	retval = sysfs_create_group(speakup_kobj, &i18n_attr_group);
 	if (retval)
-		speakup_kobj_exit();
+		goto err_group;
+
+	return 0;
 
+err_group:
+	sysfs_remove_group(speakup_kobj, &main_attr_group);
+err_speakup:
+	kobject_put(speakup_kobj);
+err_acc:
+	kobject_put(accessibility_kobj);
 	return retval;
 }
 
 void speakup_kobj_exit(void)
 {
+	sysfs_remove_group(speakup_kobj, &i18n_attr_group);
+	sysfs_remove_group(speakup_kobj, &main_attr_group);
 	kobject_put(speakup_kobj);
 	kobject_put(accessibility_kobj);
 }