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>

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 1adce9ff52c..fd83cc0c134 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)
                 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/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index b54598550dc..f3880f8977e 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)
                 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;