diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-18 15:13:02 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-04 18:32:17 +0100 |
| commit | b48293db4a348e9759c1f8a41a84f2e9f559decf (patch) | |
| tree | 650631000f9e33759ba7ad3fe971e7c5c39a557e /drivers/media/dvb-frontends/drx39xyj/drxj.c | |
| parent | [media] drx-j: Be sure that all allocated data are properly initialized (diff) | |
| download | linux-b48293db4a348e9759c1f8a41a84f2e9f559decf.tar.xz linux-b48293db4a348e9759c1f8a41a84f2e9f559decf.zip | |
[media] drx-j: dynamically load the firmware
Instead of hardcoding the firmware files together with the driver,
use request_firmware() way, loading it from userspace.
The firmware files are placed at:
http://linuxtv.org/downloads/firmware/#8
And they'll be latter submitted to linux-firmware git tree.
Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/drx39xyj/drxj.c')
| -rw-r--r-- | drivers/media/dvb-frontends/drx39xyj/drxj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c index e21dd5a7dd2b..b90e6c1210f8 100644 --- a/drivers/media/dvb-frontends/drx39xyj/drxj.c +++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c @@ -875,7 +875,7 @@ struct i2c_device_addr drxj_default_addr_g = { * \brief Default common attributes of a drxj demodulator instance. */ struct drx_common_attr drxj_default_comm_attr_g = { - (u8 *)NULL, /* ucode ptr */ + NULL, /* ucode file */ true, /* ucode verify switch */ {0}, /* version record */ @@ -20139,11 +20139,11 @@ int drxj_open(struct drx_demod_instance *demod) } /* Upload microcode */ - if (common_attr->microcode != NULL) { + if (common_attr->microcode_file != NULL) { /* Dirty trick to use common ucode upload & verify, pretend device is already open */ common_attr->is_opened = true; - ucode_info.mc_data = common_attr->microcode; + ucode_info.mc_file = common_attr->microcode_file; #ifdef DRXJ_SPLIT_UCODE_UPLOAD /* Upload microcode without audio part */ |