summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-11 23:47:20 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-11 23:47:20 +0100
commitd7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch)
treea6471779a25cf2794542f9441213f5aa5f337f2f /drivers/scsi
parent[PATCH] sata_sil24: fix mwdma_mask setting (diff)
parent[PATCH] radeonfb: Fix static array overrun (diff)
downloadlinux-d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79.tar.xz
linux-d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79.zip
Merge branch 'master'
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sr_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 5d02ff4db6cc..b65462f76484 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -192,7 +192,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
SDev = cd->device;
if (!sense) {
- sense = kmalloc(sizeof(*sense), GFP_KERNEL);
+ sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
if (!sense) {
err = -ENOMEM;
goto out;