From 85a394ccc90c347a34b94b5d62a873f33b94f75b Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso A <dave@gnu.org>
Date: Fri, 7 Aug 2009 16:42:21 -0400
Subject: [PATCH] --- yaml --- r: 161055 b: refs/heads/master c:
 a2cf8a6306c89223d0ed35a7e9d40da99902e32a h: refs/heads/master i:   161053:
 204a785b544aced197ece22187589a096173d725   161051:
 4cc71c703cf491ba5ee4f8cf8c0f708e40107a9a   161047:
 88de06e60003b4ed7dcd4134a1dc1c1b62cf2df3   161039:
 48d0c394862c3f60db65bba82d3830d473dbe6d3   161023:
 82548dbeaf3779415ee8e4fed94485e94a29b97e v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/ch.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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;