From 10560f41153c48f40be74098f53920055faf0d50 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Fri, 5 Oct 2012 11:33:04 +0000
Subject: [PATCH] --- yaml --- r: 332898 b: refs/heads/master c:
 6734011f3c9a17070f157656f8b15e051e37aee1 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/irda/mcs7780.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c93bd763e7e5..90ead163fd55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87286477c4688e5324e24916a1b2da4972ea84ba
+refs/heads/master: 6734011f3c9a17070f157656f8b15e051e37aee1
diff --git a/trunk/drivers/net/irda/mcs7780.c b/trunk/drivers/net/irda/mcs7780.c
index 1a00b5990cb8..f07c340990da 100644
--- a/trunk/drivers/net/irda/mcs7780.c
+++ b/trunk/drivers/net/irda/mcs7780.c
@@ -920,8 +920,10 @@ static int mcs_probe(struct usb_interface *intf,
 
 	ndev->netdev_ops = &mcs_netdev_ops;
 
-	if (!intf->cur_altsetting)
+	if (!intf->cur_altsetting) {
+		ret = -ENOMEM;
 		goto error2;
+	}
 
 	ret = mcs_find_endpoints(mcs, intf->cur_altsetting->endpoint,
 				 intf->cur_altsetting->desc.bNumEndpoints);