redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Antti Palosaari 2012-05-25 12:28:43 -03:00 committed by Mauro Carvalho Chehab
parent 649216704a
commit 005bc3fce7
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/media/dvb/dvb-usb/dvb_usb.h
View file

@ -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 *);

10
drivers/media/dvb/dvb-usb/dvb_usb_firmware.c
View file

@ -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) {