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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index 172f1f928f02..010075535221 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -123,10 +123,10 @@ static int drx_load_fw(struct drx397xD_state *s, enum fw_ix ix)
         }
         memset(&fw[ix].data[0], 0, sizeof(fw[0].data));
 
-        if (request_firmware(&fw[ix].file, fw[ix].name, &s->i2c->dev) != 0) {
+        rc = request_firmware(&fw[ix].file, fw[ix].name, s->i2c->dev.parent);
+        if (rc != 0) {
                 printk(KERN_ERR "%s: Firmware \"%s\" not available\n",
                        mod_name, fw[ix].name);
-                rc = -ENOENT;
                 goto exit_err;
         }