From 14876d879c0240ff98e4227691aae9c7a3292698 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Mon, 31 May 2010 16:27:39 -0300
Subject: [PATCH] --- yaml --- r: 202054 b: refs/heads/master c:
 8b0d7048dc2f0d2e4344bc8aaf85b4f14196145f h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/anysee.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e09fb71993ba..61f4b22a1a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128fe95d77d6c5239ce6af6c3edacafc79eb0a39
+refs/heads/master: 8b0d7048dc2f0d2e4344bc8aaf85b4f14196145f
diff --git a/trunk/drivers/media/dvb/dvb-usb/anysee.c b/trunk/drivers/media/dvb/dvb-usb/anysee.c
index faca1ad88a67..aa5c7d5eef69 100644
--- a/trunk/drivers/media/dvb/dvb-usb/anysee.c
+++ b/trunk/drivers/media/dvb/dvb-usb/anysee.c
@@ -463,6 +463,11 @@ static int anysee_probe(struct usb_interface *intf,
 	if (intf->num_altsetting < 1)
 		return -ENODEV;
 
+	/*
+	 * Anysee is always warm (its USB-bridge, Cypress FX2, uploads
+	 * firmware from eeprom).  If dvb_usb_device_init() succeeds that
+	 * means d is a valid pointer.
+	 */
 	ret = dvb_usb_device_init(intf, &anysee_properties, THIS_MODULE, &d,
 		adapter_nr);
 	if (ret)
@@ -479,10 +484,7 @@ static int anysee_probe(struct usb_interface *intf,
 	if (ret)
 		return ret;
 
-	if (d)
-		ret = anysee_init(d);
-
-	return ret;
+	return anysee_init(d);
 }
 
 static struct usb_device_id anysee_table[] = {