[media] dvb_usb_v2: restore .firmware - pointer to name

Most commonly only one firmware is used by the driver
and it is not needed to selected run time. So restore
old functionality but allow .get_firmware_name() callback
to override it.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
index 974337ddc5c4b1f919b2ea6f41f0156d709b437c..716f174556697e928296ed397c02de3d4c6ca800 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/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/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c b/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
index 62bd865a64622a2d75ff7205dd28fe15e0474a21..e0b43139c0c44d14e0d5c2ddeb4a39b2d6f0e537 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
+++ b/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) {