forked from luck/tmp_suning_uos_patched
floppy: handle device_create_file() failure while init
This patch kills the "ignoring return value of 'device_create_file'" warning message. Signed-off-by: Monakhov Dmitriy <dmonakhov@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6de2d20235
commit
4ea1b0f4c4
@ -4334,7 +4334,10 @@ static int __init floppy_init(void)
|
|||||||
if (err)
|
if (err)
|
||||||
goto out_flush_work;
|
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... */
|
/* to be cleaned up... */
|
||||||
disks[drive]->private_data = (void *)(long)drive;
|
disks[drive]->private_data = (void *)(long)drive;
|
||||||
disks[drive]->queue = floppy_queue;
|
disks[drive]->queue = floppy_queue;
|
||||||
@ -4345,6 +4348,8 @@ static int __init floppy_init(void)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
out_unreg_platform_dev:
|
||||||
|
platform_device_unregister(&floppy_device[drive]);
|
||||||
out_flush_work:
|
out_flush_work:
|
||||||
flush_scheduled_work();
|
flush_scheduled_work();
|
||||||
if (usage_count)
|
if (usage_count)
|
||||||
|
Loading…
Reference in New Issue
Block a user