From 84050923632971f36e80901894d4dd69485014a0 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 24 Jul 2012 02:42:14 +0000
Subject: [PATCH] --- yaml --- r: 318914 b: refs/heads/master c:
 c66b9b7d365444b433307ebb18734757cb668a02 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/caif/caif_serial.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b367899d9ca..b1985fa028e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3324d024ba4bebb74a78d84b925b59df73a92fbd
+refs/heads/master: c66b9b7d365444b433307ebb18734757cb668a02
diff --git a/trunk/drivers/net/caif/caif_serial.c b/trunk/drivers/net/caif/caif_serial.c
index 8a3054b84812..5de74e762021 100644
--- a/trunk/drivers/net/caif/caif_serial.c
+++ b/trunk/drivers/net/caif/caif_serial.c
@@ -325,6 +325,9 @@ static int ldisc_open(struct tty_struct *tty)
 
 	sprintf(name, "cf%s", tty->name);
 	dev = alloc_netdev(sizeof(*ser), name, caifdev_setup);
+	if (!dev)
+		return -ENOMEM;
+
 	ser = netdev_priv(dev);
 	ser->tty = tty_kref_get(tty);
 	ser->dev = dev;