Merge commit 'origin/master' into next

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index a8429ebfa8a2..eac20650499f 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -879,7 +879,8 @@ static int nxt2002_init(struct dvb_frontend* fe)
 
         /* request the firmware, this will block until someone uploads it */
         printk("nxt2002: Waiting for firmware upload (%s)...\n", NXT2002_DEFAULT_FIRMWARE);
-        ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE, &state->i2c->dev);
+        ret = request_firmware(&fw, NXT2002_DEFAULT_FIRMWARE,
+                               state->i2c->dev.parent);
         printk("nxt2002: Waiting for firmware upload(2)...\n");
         if (ret) {
                 printk("nxt2002: No firmware uploaded (timeout or file not found?)\n");
@@ -943,7 +944,8 @@ static int nxt2004_init(struct dvb_frontend* fe)
 
         /* request the firmware, this will block until someone uploads it */
         printk("nxt2004: Waiting for firmware upload (%s)...\n", NXT2004_DEFAULT_FIRMWARE);
-        ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE, &state->i2c->dev);
+        ret = request_firmware(&fw, NXT2004_DEFAULT_FIRMWARE,
+                               state->i2c->dev.parent);
         printk("nxt2004: Waiting for firmware upload(2)...\n");
         if (ret) {
                 printk("nxt2004: No firmware uploaded (timeout or file not found?)\n");