]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] isd200: Allocate sense_buffer for hacked up scsi_cmnd
authorBoaz Harrosh <bharrosh@panasas.com>
Wed, 12 Mar 2008 17:20:09 +0000 (19:20 +0200)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 13 Mar 2008 21:47:05 +0000 (16:47 -0500)
Since the separation of sense_buffer from scsi_cmnd, Drivers that hack their
own struct scsi_cmnd like here isd200, must also take care of their own
sense_buffer.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/usb/storage/isd200.c

index 2ae1e8673b195297aeea17e7f9333ba4fecd8c42..9d3f28b92cbeaa8411d8953e6128ffe4f01af64c 100644 (file)
@@ -1469,6 +1469,7 @@ static void isd200_free_info_ptrs(void *info_)
        if (info) {
                kfree(info->id);
                kfree(info->RegsBuf);
+               kfree(info->srb.sense_buffer);
        }
 }
 
@@ -1494,7 +1495,9 @@ static int isd200_init_info(struct us_data *us)
                                kzalloc(sizeof(struct hd_driveid), GFP_KERNEL);
                info->RegsBuf = (unsigned char *)
                                kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
-               if (!info->id || !info->RegsBuf) {
+               info->srb.sense_buffer =
+                               kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+               if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
                        isd200_free_info_ptrs(info);
                        kfree(info);
                        retStatus = ISD200_ERROR;