patch-2.4.6 linux/drivers/scsi/scsi_proc.c
Next file: linux/drivers/scsi/scsi_scan.c
Previous file: linux/drivers/scsi/scsi_ioctl.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Wed Jun 27 17:10:55 2001
- Orig file:
v2.4.5/linux/drivers/scsi/scsi_proc.c
- Orig date:
Sat May 19 17:43:06 2001
diff -u --recursive --new-file v2.4.5/linux/drivers/scsi/scsi_proc.c linux/drivers/scsi/scsi_proc.c
@@ -99,6 +99,9 @@
char * page;
char *start;
+ if (hpnt->hostt->proc_info == NULL)
+ ret = -ENOSYS;
+
if (count > PROC_BLOCK_SIZE)
return -EOVERFLOW;
@@ -110,11 +113,9 @@
return -EFAULT;
}
- if (hpnt->hostt->proc_info == NULL)
- ret = -ENOSYS;
- else
- ret = hpnt->hostt->proc_info(page, &start, 0, count,
- hpnt->host_no, 1);
+ ret = hpnt->hostt->proc_info(page, &start, 0, count,
+ hpnt->host_no, 1);
+
free_page((ulong) page);
return(ret);
}
@@ -125,6 +126,10 @@
char name[10]; /* see scsi_unregister_host() */
tpnt->proc_dir = proc_mkdir(tpnt->proc_name, proc_scsi);
+ if (!tpnt->proc_dir) {
+ printk(KERN_ERR "Unable to proc_mkdir in scsi.c/build_proc_dir_entries");
+ return;
+ }
tpnt->proc_dir->owner = tpnt->module;
hpnt = scsi_hostlist;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)