diff options
author | Jiri Slaby <xslaby@fi.muni.cz> | 2006-01-09 23:52:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:41 -0500 |
commit | f86e7767990c0d63f0630cbf6018b6996f9ecde5 (patch) | |
tree | 0da8c5077c264e4c4ebb3a708a15853f91545124 | |
parent | 0eaa21fdfe2c50ba27456730cd8da8782cddaf6f (diff) |
[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>
-rw-r--r-- | drivers/media/radio/radio-maestro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index f662912ef8a1..a77da35eebce 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, | |||
180 | unsigned int cmd, void *arg) | 180 | unsigned int cmd, void *arg) |
181 | { | 181 | { |
182 | struct video_device *dev = video_devdata(file); | 182 | struct video_device *dev = video_devdata(file); |
183 | struct radio_device *card = dev->priv; | 183 | struct radio_device *card = video_get_drvdata(dev); |
184 | 184 | ||
185 | switch (cmd) { | 185 | switch (cmd) { |
186 | case VIDIOCGCAP: { | 186 | case VIDIOCGCAP: { |
@@ -256,7 +256,7 @@ static int radio_ioctl(struct inode *inode, struct file *file, | |||
256 | unsigned int cmd, unsigned long arg) | 256 | unsigned int cmd, unsigned long arg) |
257 | { | 257 | { |
258 | struct video_device *dev = video_devdata(file); | 258 | struct video_device *dev = video_devdata(file); |
259 | struct radio_device *card = dev->priv; | 259 | struct radio_device *card = video_get_drvdata(dev); |
260 | int ret; | 260 | int ret; |
261 | 261 | ||
262 | down(&card->lock); | 262 | down(&card->lock); |