diff options
| author | Antti Palosaari | 2012-05-25 17:28:43 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-08-04 12:56:22 +0200 |
| commit | 005bc3fce76b3bd7c0a583cf3e89ce11c87077cd (patch) | |
| tree | 3e0f4cc1f5927e1eb7473d273629654293454d5e /drivers/media/dvb/dvb-usb/dvb_usb.h | |
| parent | [media] dvb_usb_v2: remote controller (diff) | |
| download | kernel-qcow2-linux-005bc3fce76b3bd7c0a583cf3e89ce11c87077cd.tar.gz kernel-qcow2-linux-005bc3fce76b3bd7c0a583cf3e89ce11c87077cd.tar.xz kernel-qcow2-linux-005bc3fce76b3bd7c0a583cf3e89ce11c87077cd.zip | |
[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>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb_usb.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb_usb.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h index 974337ddc5c4..716f17455669 100644 --- 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 *); |