diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-24 09:25:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-21 13:45:25 -0200 |
| commit | da989e0bc7f2b3db3fea417c0bae3c20c6455995 (patch) | |
| tree | 4952ca6344a8a6bdff7409ed21a1e1c3743b188b /drivers/media/dvb/frontends/drxk_hard.c | |
| parent | f2ba9e5dda2afd4615dbd3c48afe64fe2ce70d4e (diff) | |
| download | lwn-da989e0bc7f2b3db3fea417c0bae3c20c6455995.tar.gz lwn-da989e0bc7f2b3db3fea417c0bae3c20c6455995.zip | |
[media] drxk: Don't assume a default firmware name
Move the ngene/ddbridge firmware into their drivers.
There are two reasons for that:
1) The firmware used there didn't work for a few devices
I tested here (Terratec H5, H6 and H7);
2) At least Terratec H7 doesn't seem to require a firmware
for it to work.
After this change, if firmware is not specified, the driver will
use a rom-based firmware (this seems to be the case for Terratec
H7, although I need to better check the USB dumps to be sure about
that).
In any case, the firmware seems to be optional, as the DRX-K driver
don't return the firmware load error.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/drxk_hard.c')
| -rw-r--r-- | drivers/media/dvb/frontends/drxk_hard.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index 6980ed7b8786..4b99255f7ba0 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c @@ -6070,9 +6070,7 @@ static int init_drxk(struct drxk_state *state) if (status < 0) goto error; - if (!state->microcode_name) - load_microcode(state, "drxk_a3.mc"); - else + if (state->microcode_name) load_microcode(state, state->microcode_name); /* disable token-ring bus through OFDM block for possible ucode upload */ |