---

yaml --- r: 330565 b: refs/heads/master c: 8b9dff5 h: refs/heads/master i: 330563: 7c11e84 v: v3
git-mirror · Aug 4, 2012 · 262c13a · 262c13a
1 parent 088a1bb
commit 262c13a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 496e82789935df7a9b13ce58807973004e443847
+refs/heads/master: 8b9dff5828cc91abddf8f4a44c8a38b1012052af
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -278,7 +278,7 @@ struct dvb_usb_device_properties {
 
 #define RECONNECTS_USB                  1
 	int        (*download_firmware) (struct dvb_usb_device *, const struct firmware *);
-	const char *firmware;
+	int (*get_firmware_name) (struct dvb_usb_device *, const char **);
 
 	int size_of_priv;
 

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
@@ -79,15 +79,20 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d)
 {
 	int ret;
 	const struct firmware *fw = NULL;
+	const char *name;
 
-	if ((ret = request_firmware(&fw, d->props.firmware, &d->udev->dev)) != 0) {
+	ret = d->props.get_firmware_name(d, &name);
+	if (ret < 0)
+		return ret;
+
+	if ((ret = request_firmware(&fw, name, &d->udev->dev)) != 0) {
 		err("did not find the firmware file. (%s) "
 			"Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)",
-			d->props.firmware,ret);
+			name,ret);
 		return ret;
 	}
 
-	info("downloading firmware from file '%s'", d->props.firmware);
+	info("downloading firmware from file '%s'", name);
 
 	switch (d->props.usb_ctrl) {
 		case CYPRESS_AN2135: