Skip to contentSkip to conversation

floppy: handle device_create_file() failure while init

DISCUSSION Jeff Garzik 1 participant 1 message May 8, 2007 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 37 lines · Linux Kernel Mailing List
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4ea1b0f4c4f656e0838a937c47be9544ed1c5118
Commit:     4ea1b0f4c4f656e0838a937c47be9544ed1c5118
Parent:     6de2d20235a2b8c751d39ec4b68347d66b19d815
Author:     Dmitriy Monakhov <[email protected]>
AuthorDate: Tue May 8 00:25:58 2007 -0700
Committer:  Linus Torvalds <[email protected]>
CommitDate: Tue May 8 11:15:02 2007 -0700

floppy: handle device_create_file() failure while init

This patch kills the "ignoring return value of 'device_create_file'" warning message.

---
 drivers/block/floppy.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
drivers/block/floppy.c +4 -1
index 5231ed7..3587cb4 100644
@@ -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;

drivers/block/floppy.c static int __init floppy_init(void) · line 4355

Quoted 8 lines
drivers/block/floppy.c +2 -0
@@ -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)

This patch appears to leave things in a half-initialized state, upon error.

That's the big reason why I did not bother with this warning, it's not the low-hanging fruit it appears to be.

Jeff