From 73b7d9d86f398d4239834a233d37b27387e8da68 Mon Sep 17 00:00:00 2001 From: Nate Dailey Date: Thu, 21 Apr 2005 16:14:05 -0400 Subject: [PATCH] --- yaml --- r: 1061 b: refs/heads/master c: 3a73e8c7715cdf53c24b602bfca15ec54d7c989b h: refs/heads/master i: 1059: 1cad132ae5ff8f3f4c1bee2dab8644e3a6033eb6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sr_ioctl.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0d5e45a551ef..46e05adb90f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bdcd78ea2342ad1a9c79cac99eefcfd0b3f1c2b +refs/heads/master: 3a73e8c7715cdf53c24b602bfca15ec54d7c989b diff --git a/trunk/drivers/scsi/sr_ioctl.c b/trunk/drivers/scsi/sr_ioctl.c index 3471be05779a..82d68fdb1548 100644 --- a/trunk/drivers/scsi/sr_ioctl.c +++ b/trunk/drivers/scsi/sr_ioctl.c @@ -281,6 +281,9 @@ int sr_get_mcn(struct cdrom_device_info *cdi, struct cdrom_mcn *mcn) char *buffer = kmalloc(32, GFP_KERNEL | SR_GFP_DMA(cd)); int result; + if (!buffer) + return -ENOMEM; + memset(&cgc, 0, sizeof(struct packet_command)); cgc.cmd[0] = GPCMD_READ_SUBCHANNEL; cgc.cmd[2] = 0x40; /* I do want the subchannel info */