Merge with 2.4.0-test11.

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
index 13d7dc398..e37175af2 100644
--- a/drivers/scsi/gdth_proc.c
+++ b/drivers/scsi/gdth_proc.c
@@ -39,7 +39,17 @@ static int gdth_set_info(char *buffer,int length,int vh,int hanum,int busnum)
     piowr = (gdth_iowr_str *)buffer;
 
     sdev = scsi_get_host_dev(gdth_ctr_vtab[vh]);
+    
+    if(sdev==NULL)
+    	return -ENOMEM;
+
     scp  = scsi_allocate_device(sdev, 1, FALSE);
+    
+    if(scp==NULL)
+    {
+	scsi_free_host_dev(sdev);
+        return -ENOMEM;
+    }
     scp->cmd_len = 12;
     scp->use_sg = 0;