diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:11:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:11:45 -0300 |
| commit | 01fac01fcb8830923bc85ba8d13146921d821dac (patch) | |
| tree | f9bc27e620621001442074cc2898dc6c796d70c8 /linux/drivers/media/common | |
| parent | 39ae4cb418ef242558b61172ca37807dd184fb70 (diff) | |
| parent | 2c8b481bed8efbeda28d5b75e0aeb5c089fc76e8 (diff) | |
| download | mediapointer-dvb-s2-01fac01fcb8830923bc85ba8d13146921d821dac.tar.gz mediapointer-dvb-s2-01fac01fcb8830923bc85ba8d13146921d821dac.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/tuners/tuner-xc2028.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/xc5000.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/tuners/tuner-xc2028.c b/linux/drivers/media/common/tuners/tuner-xc2028.c index bd010379b..3f03dfa2c 100644 --- a/linux/drivers/media/common/tuners/tuner-xc2028.c +++ b/linux/drivers/media/common/tuners/tuner-xc2028.c @@ -276,7 +276,7 @@ static int load_all_firmwares(struct dvb_frontend *fe) fname = firmware_name; tuner_dbg("Reading firmware %s\n", fname); - rc = request_firmware(&fw, fname, &priv->i2c_props.adap->dev); + rc = request_firmware(&fw, fname, priv->i2c_props.adap->dev.parent); if (rc < 0) { if (rc == -ENOENT) tuner_err("Error: firmware %s not found.\n", diff --git a/linux/drivers/media/common/tuners/xc5000.c b/linux/drivers/media/common/tuners/xc5000.c index 39c415df0..e38433ec6 100644 --- a/linux/drivers/media/common/tuners/xc5000.c +++ b/linux/drivers/media/common/tuners/xc5000.c @@ -594,7 +594,7 @@ static int xc5000_fwupload(struct dvb_frontend *fe) XC5000_DEFAULT_FIRMWARE); ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, - &priv->i2c_props.adap->dev); + priv->i2c_props.adap->dev.parent); if (ret) { printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n"); ret = XC_RESULT_RESET_FAILURE; |