[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>
This commit is contained in:
committed by
Linus Torvalds
parent
0eaa21fdfe
commit
f86e776799
@@ -180,7 +180,7 @@ static inline int radio_function(struct inode *inode, struct file *file,
|
|||||||
unsigned int cmd, void *arg)
|
unsigned int cmd, void *arg)
|
||||||
{
|
{
|
||||||
struct video_device *dev = video_devdata(file);
|
struct video_device *dev = video_devdata(file);
|
||||||
struct radio_device *card = dev->priv;
|
struct radio_device *card = video_get_drvdata(dev);
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case VIDIOCGCAP: {
|
case VIDIOCGCAP: {
|
||||||
@@ -256,7 +256,7 @@ static int radio_ioctl(struct inode *inode, struct file *file,
|
|||||||
unsigned int cmd, unsigned long arg)
|
unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct video_device *dev = video_devdata(file);
|
struct video_device *dev = video_devdata(file);
|
||||||
struct radio_device *card = dev->priv;
|
struct radio_device *card = video_get_drvdata(dev);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
down(&card->lock);
|
down(&card->lock);
|
||||||
|
Reference in New Issue
Block a user