diff --git a/[refs] b/[refs] index d218fdd7a49b..34dbec300fd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eaa21fdfe2c50ba27456730cd8da8782cddaf6f +refs/heads/master: f86e7767990c0d63f0630cbf6018b6996f9ecde5 diff --git a/trunk/drivers/media/radio/radio-maestro.c b/trunk/drivers/media/radio/radio-maestro.c index f662912ef8a1..a77da35eebce 100644 --- a/trunk/drivers/media/radio/radio-maestro.c +++ b/trunk/drivers/media/radio/radio-maestro.c @@ -180,7 +180,7 @@ static inline int radio_function(struct inode *inode, struct file *file, unsigned int cmd, void *arg) { struct video_device *dev = video_devdata(file); - struct radio_device *card = dev->priv; + struct radio_device *card = video_get_drvdata(dev); switch (cmd) { case VIDIOCGCAP: { @@ -256,7 +256,7 @@ static int radio_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { struct video_device *dev = video_devdata(file); - struct radio_device *card = dev->priv; + struct radio_device *card = video_get_drvdata(dev); int ret; down(&card->lock);