Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB: s2255drv: fix: v4l2_dev should be registered once only.

Browse Source 
usb_set_intfdata should not be used when using v4l2_device_register
and a non-NULL argument for the device.

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Dean Anderson 2010-04-20 17:21:32 -03:00 committed by Mauro Carvalho Chehab
parent 108bdd7ad7
commit 65c6edb300
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/media/video/s2255drv.c
View File

@ -229,7 +229,7 @@ struct s2255_fmt; /*forward declaration */
struct s2255_dev { struct s2255_dev {
struct video_device vdev[MAX_CHANNELS]; struct video_device vdev[MAX_CHANNELS];
struct v4l2_device v4l2_dev[MAX_CHANNELS]; struct v4l2_device v4l2_dev;
int channels; /* number of channels registered */ int channels; /* number of channels registered */
int frames; int frames;
struct mutex lock; struct mutex lock;
@ -278,7 +278,14 @@ struct s2255_dev {
u16 pid; /* product id */ u16 pid; /* product id */
struct kref kref; struct kref kref;
}; };
#define to_s2255_dev(d) container_of(d, struct s2255_dev, kref)
/* kref will be removed soon */
#define to_s2255_dev_from_kref(d) container_of(d, struct s2255_dev, kref)
static inline struct s2255_dev *to_s2255_dev(struct v4l2_device *v4l2_dev)
{
return container_of(v4l2_dev, struct s2255_dev, v4l2_dev);
}
struct s2255_fmt { struct s2255_fmt {
char *name; char *name;
@ -1829,7 +1836,7 @@ static unsigned int s2255_poll(struct file *file,
static void s2255_destroy(struct kref *kref) static void s2255_destroy(struct kref *kref)
{ {
struct s2255_dev *dev = to_s2255_dev(kref); struct s2255_dev *dev = to_s2255_dev_from_kref(kref);
/* board shutdown stops the read pipe if it is running */ /* board shutdown stops the read pipe if it is running */
s2255_board_shutdown(dev); s2255_board_shutdown(dev);
/* make sure firmware still not trying to load */ /* make sure firmware still not trying to load */
@ -1947,11 +1954,9 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
int ret; int ret;
int i; int i;
int cur_nr = video_nr; int cur_nr = video_nr;
for (i = 0; i < MAX_CHANNELS; i++) { ret = v4l2_device_register(&dev->interface->dev, &dev->v4l2_dev);
ret = v4l2_device_register(&dev->udev->dev, &dev->v4l2_dev[i]); if (ret)
if (ret) return ret;
goto unreg_v4l2;
}
/* initialize all video 4 linux */ /* initialize all video 4 linux */
/* register 4 video devices */ /* register 4 video devices */
for (i = 0; i < MAX_CHANNELS; i++) { for (i = 0; i < MAX_CHANNELS; i++) {
@ -1976,7 +1981,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
break; break;
} }
dev->channels++; dev->channels++;
v4l2_info(&dev->v4l2_dev[i], "V4L2 device registered as %s\n", v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n",
video_device_node_name(&dev->vdev[i])); video_device_node_name(&dev->vdev[i]));
} }
@ -1985,15 +1990,13 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
S2255_MAJOR_VERSION, S2255_MAJOR_VERSION,
S2255_MINOR_VERSION); S2255_MINOR_VERSION);
/* if no channels registered, return error and probe will fail*/ /* if no channels registered, return error and probe will fail*/
if (dev->channels == 0) if (dev->channels == 0) {
v4l2_device_unregister(&dev->v4l2_dev);
return ret; return ret;
}
if (dev->channels != MAX_CHANNELS) if (dev->channels != MAX_CHANNELS)
printk(KERN_WARNING "s2255: Not all channels available.\n"); printk(KERN_WARNING "s2255: Not all channels available.\n");
return 0; return 0;
unreg_v4l2:
for (i-- ; i > 0; i--)
v4l2_device_unregister(&dev->v4l2_dev[i]);
return ret;
} }
/* this function moves the usb stream read pipe data /* this function moves the usb stream read pipe data
@ -2596,8 +2599,6 @@ static int s2255_probe(struct usb_interface *interface,
dev_err(&interface->dev, "Could not find bulk-in endpoint\n"); dev_err(&interface->dev, "Could not find bulk-in endpoint\n");
goto errorEP; goto errorEP;
} }
/* set intfdata */
usb_set_intfdata(interface, dev);
init_timer(&dev->timer); init_timer(&dev->timer);
dev->timer.function = s2255_timer; dev->timer.function = s2255_timer;
dev->timer.data = (unsigned long)dev->fw_data; dev->timer.data = (unsigned long)dev->fw_data;
@ -2682,13 +2683,12 @@ errorFWDATA1:
return retval; return retval;
} }
/* disconnect routine. when board is removed physically or with rmmod */ /* disconnect routine. when board is removed physically or with rmmod */
static void s2255_disconnect(struct usb_interface *interface) static void s2255_disconnect(struct usb_interface *interface)
{ {
struct s2255_dev *dev = NULL; struct s2255_dev *dev = to_s2255_dev(usb_get_intfdata(interface));
int i; int i;
dev = usb_get_intfdata(interface); v4l2_device_unregister(&dev->v4l2_dev);
/* unregister each video device. */ /* unregister each video device. */
for (i = 0; i < MAX_CHANNELS; i++) for (i = 0; i < MAX_CHANNELS; i++)
if (video_is_registered(&dev->vdev[i])) if (video_is_registered(&dev->vdev[i]))
@ -2702,7 +2702,6 @@ static void s2255_disconnect(struct usb_interface *interface)
dev->vidstatus_ready[i] = 1; dev->vidstatus_ready[i] = 1;
wake_up(&dev->wait_vidstatus[i]); wake_up(&dev->wait_vidstatus[i]);
} }
usb_set_intfdata(interface, NULL);
kref_put(&dev->kref, s2255_destroy); kref_put(&dev->kref, s2255_destroy);
dev_info(&interface->dev, "%s\n", __func__); dev_info(&interface->dev, "%s\n", __func__);
} }