From d83f18c44d4e8cb7ed45e60d8a69484520296750 Mon Sep 17 00:00:00 2001 From: Dmitriy Monakhov Date: Tue, 8 May 2007 00:25:58 -0700 Subject: [PATCH] --- yaml --- r: 54585 b: refs/heads/master c: 4ea1b0f4c4f656e0838a937c47be9544ed1c5118 h: refs/heads/master i: 54583: 7492f7bfd5f5061c23688cad724b67810c4938d6 v: v3 --- [refs] | 2 +- trunk/drivers/block/floppy.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cc231aa1c52..f8ea90ba696b 100644 --- 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 index 5231ed7e723f..3587cb434371 100644 --- 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)