diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-04-26 04:43:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:56 -0400 |
commit | e9785250ef2eead8bd5e9166679c0be0595df387 (patch) | |
tree | 8bc16b02d4f80206190183e7a9d3224395e9203a /drivers/media/common/tuners | |
parent | f8eaaf4f2a2810d6e486da2916ef07f7e00665c9 (diff) |
V4L/DVB (11723): Link firmware to physical device
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 'drivers/media/common/tuners')
-rw-r--r-- | drivers/media/common/tuners/tuner-xc2028.c | 2 | ||||
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index 1adce9ff52ce..fd83cc0c134c 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c | |||
@@ -272,7 +272,7 @@ static int load_all_firmwares(struct dvb_frontend *fe) | |||
272 | fname = firmware_name; | 272 | fname = firmware_name; |
273 | 273 | ||
274 | tuner_dbg("Reading firmware %s\n", fname); | 274 | tuner_dbg("Reading firmware %s\n", fname); |
275 | rc = request_firmware(&fw, fname, &priv->i2c_props.adap->dev); | 275 | rc = request_firmware(&fw, fname, priv->i2c_props.adap->dev.parent); |
276 | if (rc < 0) { | 276 | if (rc < 0) { |
277 | if (rc == -ENOENT) | 277 | if (rc == -ENOENT) |
278 | tuner_err("Error: firmware %s not found.\n", | 278 | tuner_err("Error: firmware %s not found.\n", |
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index b54598550dc4..f3880f8977e0 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -575,7 +575,7 @@ static int xc5000_fwupload(struct dvb_frontend *fe) | |||
575 | XC5000_DEFAULT_FIRMWARE); | 575 | XC5000_DEFAULT_FIRMWARE); |
576 | 576 | ||
577 | ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, | 577 | ret = request_firmware(&fw, XC5000_DEFAULT_FIRMWARE, |
578 | &priv->i2c_props.adap->dev); | 578 | priv->i2c_props.adap->dev.parent); |
579 | if (ret) { | 579 | if (ret) { |
580 | printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n"); | 580 | printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n"); |
581 | ret = XC_RESULT_RESET_FAILURE; | 581 | ret = XC_RESULT_RESET_FAILURE; |