From e83eab381a2c575fe659e4ea6400f59669bd2d46 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sun, 19 Aug 2012 09:02:54 +0200
Subject: [PATCH] --- yaml --- r: 321919 b: refs/heads/master c:
 b17cbdd85f84c8323189416da6e9701d2793b0e5 h: refs/heads/master i:   321917:
 93a7ad0649c1110e2a7d0d78ddb4ca09f125b8e0   321915:
 59ca5a072aee427f08b38ad2c4e798e689f0115a   321911:
 7ad16eb6fe6023441fca8611a51650fd33ca2ace   321903:
 a82e56a3dc48e50d7af8646d6d6b7d5bd88af580   321887:
 3deb41aac902392495768c58117e297bd42fb6ab   321855:
 f16b8c1deb1c63c5241df0698213cc1dc6115e47   321791:
 48e00967010bc98acca56c4fca3f8756327afb9e v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/rme9652/hdspm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c80361c35f8f..7bff3e69e448 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae970eb45d8a1ea4506be23c3f776225b9575d0e
+refs/heads/master: b17cbdd85f84c8323189416da6e9701d2793b0e5
diff --git a/trunk/sound/pci/rme9652/hdspm.c b/trunk/sound/pci/rme9652/hdspm.c
index b8ac8710f47f..b12308b5ba2a 100644
--- a/trunk/sound/pci/rme9652/hdspm.c
+++ b/trunk/sound/pci/rme9652/hdspm.c
@@ -6585,7 +6585,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
 		snd_printk(KERN_ERR "HDSPM: "
 				"unable to kmalloc Mixer memory of %d Bytes\n",
 				(int)sizeof(struct hdspm_mixer));
-		return err;
+		return -ENOMEM;
 	}
 
 	hdspm->port_names_in = NULL;