From a419ebfc56f1c15eb3e1f03c24022ed1d36afd84 Mon Sep 17 00:00:00 2001
From: Amit Choudhary <amit2030@gmail.com>
Date: Mon, 9 Oct 2006 16:03:23 +0200
Subject: [PATCH] --- yaml --- r: 40203 b: refs/heads/master c:
 fbdbb2205a7ff3c3e19941477cde6f9a693637ef h: refs/heads/master i:   40201:
 b4504477ab2a3b0b34e9ba38142bbabb0bb27873   40199:
 88d82522496c19df799c8eb14b2af0ff0143d971 v: v3

---
 [refs]                    | 2 +-
 trunk/sound/isa/cmi8330.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e978e221b299..908f729be0db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a81a21b6095997f50ac9ca37e4fdfe48d789ad7
+refs/heads/master: fbdbb2205a7ff3c3e19941477cde6f9a693637ef
diff --git a/trunk/sound/isa/cmi8330.c b/trunk/sound/isa/cmi8330.c
index 3c1e9fd56fe0..d1f6dfcec46e 100644
--- a/trunk/sound/isa/cmi8330.c
+++ b/trunk/sound/isa/cmi8330.c
@@ -289,6 +289,8 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
 	struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
 	int err;
 
+	if (!cfg)
+		return -ENOMEM;
 	acard->cap = pnp_request_card_device(card, id->devs[0].id, NULL);
 	if (acard->cap == NULL) {
 		kfree(cfg);