summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJiri Slaby <xslaby@fi.muni.cz>2006-01-09 20:52:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:01:41 -0800
commitf86e7767990c0d63f0630cbf6018b6996f9ecde5 (patch)
tree0da8c5077c264e4c4ebb3a708a15853f91545124 /drivers/media
parent0eaa21fdfe2c50ba27456730cd8da8782cddaf6f (diff)
downloadop-kernel-dev-f86e7767990c0d63f0630cbf6018b6996f9ecde5.zip
op-kernel-dev-f86e7767990c0d63f0630cbf6018b6996f9ecde5.tar.gz
[PATCH] media-radio: Maestro avoid accessing private structures directly
video_device.priv is not allowed to touch and it will be actually removed in near future. Use video_get_drvdata() instead. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/radio/radio-maestro.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index f662912..a77da35 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/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);
OpenPOWER on IntegriCloud