diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-26 08:43:59 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-26 08:43:59 +0000 |
| commit | 8336aa0dd9ebd561d8bd2bd866b37071d0d0c79a (patch) | |
| tree | 71c83ac02e1109c76234285f6c4c79a49a8cdcf7 /linux/drivers/media/common/tuners | |
| parent | 3a5029e47ebbbb4707dce75ad6beebe667224ba5 (diff) | |
| download | mediapointer-dvb-s2-8336aa0dd9ebd561d8bd2bd866b37071d0d0c79a.tar.gz mediapointer-dvb-s2-8336aa0dd9ebd561d8bd2bd866b37071d0d0c79a.tar.bz2 | |
Link firmware to physical device
From: Jean Delvare <khali@linux-fr.org>
Use the physical device rather than the i2c adapter as the reference
device when loading firmwares. This will prevent the sysfs name
collision with i2c-dev that has been reported many times.
I may have missed other drivers which need the same fix.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common/tuners')
| -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; |