diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-17 12:27:22 +0100 |
commit | 67cbf8a216259dceefe570f6dc14746f43b2e627 (patch) | |
tree | 1eca0b9922dee01b4d00dc0713b7ff434dddd44c /drivers/media/video/usbvideo/vicam.c | |
parent | 6c941c8556dd9269be621cd8159fc60e955a91b3 (diff) | |
parent | 2fbe74b90bafebce615466b4c20f96b0465df1ae (diff) |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/media/video/usbvideo/vicam.c')
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 45fce39ec9a..6030410c667 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c @@ -796,7 +796,6 @@ static const struct v4l2_file_operations vicam_fops = { static struct video_device vicam_template = { .name = "ViCam-based USB Camera", .fops = &vicam_fops, - .minor = -1, .release = video_device_release_empty, }; @@ -873,8 +872,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id) return -EIO; } - printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n", - cam->vdev.num); + printk(KERN_INFO "ViCam webcam driver now controlling device %s\n", + video_device_node_name(&cam->vdev)); usb_set_intfdata (intf, cam); |