From f4647b2a716cb453ad79553b5a785c1f51ad3ab9 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 27 Apr 2010 19:09:45 -0300
Subject: [PATCH] --- yaml --- r: 193088 b: refs/heads/master c:
 0b42760a75afb852be6718fb5e6b54988123b40e h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/dvb/frontends/dib7000p.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a25722af9ef7..0a30e7eef165 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30d81bb086c84d54cde4dd4d0c75d9455224632b
+refs/heads/master: 0b42760a75afb852be6718fb5e6b54988123b40e
diff --git a/trunk/drivers/media/dvb/frontends/dib7000p.c b/trunk/drivers/media/dvb/frontends/dib7000p.c
index 113fc1394d5d..2e28b973dfd3 100644
--- a/trunk/drivers/media/dvb/frontends/dib7000p.c
+++ b/trunk/drivers/media/dvb/frontends/dib7000p.c
@@ -1330,7 +1330,7 @@ int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 defau
 
 	dpst = kzalloc(sizeof(struct dib7000p_state), GFP_KERNEL);
 	if (!dpst)
-		return -ENODEV;
+		return -ENOMEM;
 
 	dpst->i2c_adap = i2c;