diff --git a/[refs] b/[refs]
index cbbda06d5327..c966da483b26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68866927ddd0ed3145cb3fba4a1c07ca5e4709d
+refs/heads/master: a2cf8a6306c89223d0ed35a7e9d40da99902e32a
diff --git a/trunk/drivers/scsi/ch.c b/trunk/drivers/scsi/ch.c
index 7b1633a8c15a..fe11c1d4b31d 100644
--- a/trunk/drivers/scsi/ch.c
+++ b/trunk/drivers/scsi/ch.c
@@ -353,6 +353,12 @@ ch_readconfig(scsi_changer *ch)
 	/* look up the devices of the data transfer elements */
 	ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device),
 			 GFP_KERNEL);
+
+	if (!ch->dt) {
+		kfree(buffer);
+		return -ENOMEM;
+	}
+
 	for (elem = 0; elem < ch->counts[CHET_DT]; elem++) {
 		id  = -1;
 		lun = 0;