From f17612af5d0abde89ad6d4443e719e5e2a6ff952 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <pb@linuxtv.org>
Date: Tue, 7 Feb 2006 06:49:12 -0200
Subject: [PATCH] --- yaml --- r: 21631 b: refs/heads/master c:
 21d06544a745a09cc1e9ce5376a61b074bfce379 h: refs/heads/master i:   21629:
 5bfe9e89979e97b7d2ad5de3b321fb48777362cc   21627:
 b2ce80a7e5bcc3d2ae9bf62cafb816a89f4af56d   21623:
 7554c26b3564b0ddcbd37e340c22b7250304d3cc   21615:
 5c93eaaa4b656a5c4fb9288fe6e4844e6e285996   21599:
 0c5ed88cddd68df497417ee3f5f1a8b55d1cb961   21567:
 9f44747b7d910658de89addeb3c3f441bf657f19   21503:
 f10775e2cb34d2b69e366cd0dc016f6f54c462d8 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/dvb-usb/digitv.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fb7f15f56f3d..829236569163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 123aab28608ac81938865b31db188c985aeb4424
+refs/heads/master: 21d06544a745a09cc1e9ce5376a61b074bfce379
diff --git a/trunk/drivers/media/dvb/dvb-usb/digitv.c b/trunk/drivers/media/dvb/dvb-usb/digitv.c
index e6c55c9c9417..caa1346e3063 100644
--- a/trunk/drivers/media/dvb/dvb-usb/digitv.c
+++ b/trunk/drivers/media/dvb/dvb-usb/digitv.c
@@ -175,11 +175,13 @@ static int digitv_probe(struct usb_interface *intf,
 	if ((ret = dvb_usb_device_init(intf,&digitv_properties,THIS_MODULE,&d)) == 0) {
 		u8 b[4] = { 0 };
 
-		b[0] = 1;
-		digitv_ctrl_msg(d,USB_WRITE_REMOTE_TYPE,0,b,4,NULL,0);
+		if (d != NULL) { /* do that only when the firmware is loaded */
+			b[0] = 1;
+			digitv_ctrl_msg(d,USB_WRITE_REMOTE_TYPE,0,b,4,NULL,0);
 
-		b[0] = 0;
-		digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
+			b[0] = 0;
+			digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
+		}
 	}
 	return ret;
 }
@@ -194,7 +196,7 @@ static struct dvb_usb_properties digitv_properties = {
 	.caps = DVB_USB_IS_AN_I2C_ADAPTER,
 
 	.usb_ctrl = CYPRESS_FX2,
-	.firmware = "dvb-usb-digitv-01.fw",
+	.firmware = "dvb-usb-digitv-02.fw",
 
 	.size_of_priv     = 0,
 
@@ -229,6 +231,7 @@ static struct dvb_usb_properties digitv_properties = {
 			{ &digitv_table[0], NULL },
 			{ NULL },
 		},
+		{ NULL },
 	}
 };