diff options
| author | Antti Palosaari <crope@iki.fi> | 2012-06-18 23:42:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-04 07:56:36 -0300 |
| commit | a0921af7eb2eced1639fc1e1befdf703e7bec95a (patch) | |
| tree | f284c5b1fbef5987c75d3b70e803aa28623d084f /drivers/media/dvb/dvb-usb/af9035.c | |
| parent | b905a2a13307035a4a5c9a93a3607e51e6736db2 (diff) | |
| download | linux-a0921af7eb2eced1639fc1e1befdf703e7bec95a.tar.bz2 | |
[media] dvb_usb_v2: use identify_state() to resolve firmware name
Merge get_firmware_name() to identify_state().
It is wise to resolve firmware name in that routine as it does
decision wether or not to load firmware at all. It is one very
rarely needed callback less.
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/af9035.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/af9035.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9035.c b/drivers/media/dvb/dvb-usb/af9035.c index ba2a0c1a65a2..b030055d14a3 100644 --- a/drivers/media/dvb/dvb-usb/af9035.c +++ b/drivers/media/dvb/dvb-usb/af9035.c @@ -278,7 +278,7 @@ static struct i2c_algorithm af9035_i2c_algo = { .functionality = af9035_i2c_functionality, }; -static int af9035_identify_state(struct dvb_usb_device *d) +static int af9035_identify_state(struct dvb_usb_device *d, const char **name) { int ret; u8 wbuf[1] = { 1 }; |