Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=da3962fe63eae4f490356cb54e4700eac752541b
Commit: da3962fe63eae4f490356cb54e4700eac752541b
Parent: a57850379e389829a2fc569733b41da3d52bf366
Author: Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Tue Jun 26 00:39:33 2007 +0900
Committer: James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sat Jul 14 18:54:34 2007 -0500
[SCSI] sr: fix error handling in module_init
Sweep registered blkdev when scsi_register_driver has failed.
Cc: Jens Axboe <[EMAIL PROTECTED]>
Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
drivers/scsi/sr.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index f9a52af..5143c89 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -885,7 +885,11 @@ static int __init init_sr(void)
rc = register_blkdev(SCSI_CDROM_MAJOR, "sr");
if (rc)
return rc;
- return scsi_register_driver(&sr_template.gendrv);
+ rc = scsi_register_driver(&sr_template.gendrv);
+ if (rc)
+ unregister_blkdev(SCSI_CDROM_MAJOR, "sr");
+
+ return rc;
}
static void __exit exit_sr(void)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
