---

yaml --- r: 54585 b: refs/heads/master c: 4ea1b0f h: refs/heads/master i: 54583: 7492f7b v: v3
git-mirror · May 8, 2007 · d83f18c · d83f18c
1 parent f3d0512
commit d83f18c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de2d20235a2b8c751d39ec4b68347d66b19d815
+refs/heads/master: 4ea1b0f4c4f656e0838a937c47be9544ed1c5118
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
@@ -4334,7 +4334,10 @@ static int __init floppy_init(void)
 		if (err)
 			goto out_flush_work;
 
-		device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
+		err = device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
+		if (err)
+			goto out_unreg_platform_dev;
+
 		/* to be cleaned up... */
 		disks[drive]->private_data = (void *)(long)drive;
 		disks[drive]->queue = floppy_queue;
@@ -4345,6 +4348,8 @@ static int __init floppy_init(void)
 
 	return 0;
 
+out_unreg_platform_dev:
+	platform_device_unregister(&floppy_device[drive]);
 out_flush_work:
 	flush_scheduled_work();
 	if (usage_count)