patch-2.4.0-test3 linux/drivers/cdrom/sbpcd.c

• Lines: 34
• Date: Wed Jul 5 13:15:19 2000
• Orig file: v2.4.0-test2/linux/drivers/cdrom/sbpcd.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/cdrom/sbpcd.c linux/drivers/cdrom/sbpcd.c
@@ -5752,7 +5752,7 @@
 	
 	request_region(CDo_command,4,major_name);
 	
-	devfs_handle = devfs_mk_dir (NULL, "sbp", 0, NULL);
+	devfs_handle = devfs_mk_dir (NULL, "sbp", NULL);
 	for (j=0;j<NR_SBPCD;j++)
 	{
 		struct cdrom_device_info * sbpcd_infop;
@@ -5779,6 +5779,7 @@
 				printk("Can't unregister %s\n", major_name);
 			}
 			release_region(CDo_command,4);
+			blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 			return -EIO;
 		}
 #ifdef MODULE
@@ -5794,6 +5795,7 @@
 		if (sbpcd_infop == NULL)
 		{
                         release_region(CDo_command,4);
+			blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
                         return -ENOMEM;
 		}
 		D_S[j].sbpcd_infop = sbpcd_infop;
@@ -5845,7 +5847,7 @@
 		return;
 	}
 	release_region(CDo_command,4);
-	
+	blk_cleanup_queue(BLK_DEFAULT_QUEUE(MAJOR_NR));
 	devfs_unregister (devfs_handle);
 	for (j=0;j<NR_SBPCD;j++)
 	{