Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / drivers / media / dvb / firewire / firedtv-1394.c

diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c
index 4e207658c5d95a0c58dca4d62e6b664ad7e41f3f..2b6eeeab5b257ff2e2469afb8f0587da98a4ea0f 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-1394.c
+++ b/drivers/media/dvb/firewire/firedtv-1394.c
@@ -225,7 +225,7 @@ fail_free:
 
 static int node_remove(struct device *dev)
 {
-       struct firedtv *fdtv = dev->driver_data;
+       struct firedtv *fdtv = dev_get_drvdata(dev);
 
        fdtv_dvb_unregister(fdtv);
 
@@ -242,7 +242,7 @@ static int node_remove(struct device *dev)
 
 static int node_update(struct unit_directory *ud)
 {
-       struct firedtv *fdtv = ud->device.driver_data;
+       struct firedtv *fdtv = dev_get_drvdata(&ud->device);
 
        if (fdtv->isochannel >= 0)
                cmp_establish_pp_connection(fdtv, fdtv->subunit,