From ed44448b342b76d0d3c7ff276e289772fdf56c15 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Fri, 25 May 2012 12:28:43 -0300
Subject: [PATCH] --- yaml --- r: 330571 b: refs/heads/master c:
 005bc3fce76b3bd7c0a583cf3e89ce11c87077cd h: refs/heads/master i:   330569:
 5845777ad8bdc5c37a7028348614867805f33cdf   330567:
 8000c62d0f3792acf8ccee99d938d4c45bab1872 v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb_usb.h          |  7 ++++---
 trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c | 10 +++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c63ba1919df3..672e49d6dede 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 649216704aaa1148c638346ec4c0dc71b164f521
+refs/heads/master: 005bc3fce76b3bd7c0a583cf3e89ce11c87077cd
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
index 974337ddc5c4..716f17455669 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -219,12 +219,13 @@ struct dvb_usb_device_properties {
 #define CYPRESS_FX2     3
 	int        usb_ctrl;
 
+	int size_of_priv;
+
+	const char *firmware;
+	int (*get_firmware_name) (struct dvb_usb_device *, const char **);
 #define RECONNECTS_USB                  1
 	int (*download_firmware) (struct dvb_usb_device *,
 			const struct firmware *);
-	int (*get_firmware_name) (struct dvb_usb_device *, const char **);
-
-	int size_of_priv;
 
 	int num_adapters;
 	int (*get_adapter_count) (struct dvb_usb_device *);
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
index 62bd865a6462..e0b43139c0c4 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
@@ -96,9 +96,13 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d)
 	const struct firmware *fw = NULL;
 	const char *name;
 
-	ret = d->props.get_firmware_name(d, &name);
-	if (ret < 0)
-		return ret;
+	/* resolve firmware name */
+	name = d->props.firmware;
+	if (d->props.get_firmware_name) {
+		ret = d->props.get_firmware_name(d, &name);
+		if (ret < 0)
+			return ret;
+	}
 
 	ret = request_firmware(&fw, name, &d->udev->dev);
 	if (ret != 0) {