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

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

diff --git a/drivers/media/dvb/firewire/firedtv-dvb.c b/drivers/media/dvb/firewire/firedtv-dvb.c
index 9d308dd32a5ce4337efe97f594b2663aebe5570f..5742fde79d99d71f25bc62d390984a42294d1ab8 100644 (file)
--- a/drivers/media/dvb/firewire/firedtv-dvb.c
+++ b/drivers/media/dvb/firewire/firedtv-dvb.c
@@ -268,7 +268,7 @@ struct firedtv *fdtv_alloc(struct device *dev,
        if (!fdtv)
                return NULL;
 
-       dev->driver_data        = fdtv;
+       dev_set_drvdata(dev, fdtv);
        fdtv->device            = dev;
        fdtv->isochannel        = -1;
        fdtv->voltage           = 0xff;