apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge ../scsi-misc-2.6

Browse Source 
Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2006-07-03 09:41:12 -05:00
parent 29454dde27 d6b0c53723
commit c4e00fac42
74 changed files with 4528 additions and 2890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/scsi/sg.c
+9 -1
View File
@@ -1401,6 +1401,7 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
Sg_device *sdp = NULL;
struct cdev * cdev = NULL;
int error, k;
unsigned long iflags;
disk = alloc_disk(1);
if (!disk) {
@@ -1428,7 +1429,7 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
error = cdev_add(cdev, MKDEV(SCSI_GENERIC_MAJOR, k), 1);
if (error)
goto out;
goto cdev_add_err;
sdp->cdev = cdev;
if (sg_sysfs_valid) {
@@ -1455,6 +1456,13 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
return 0;
cdev_add_err:
write_lock_irqsave(&sg_dev_arr_lock, iflags);
kfree(sg_dev_arr[k]);
sg_dev_arr[k] = NULL;
sg_nr_dev--;
write_unlock_irqrestore(&sg_dev_arr_lock, iflags);
out:
put_disk(disk);
if (cdev)