mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
[media] stk-webcam: add support for struct v4l2_device
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Arvydas Sidorenko <asido4@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
e144760a33
commit
968c60f603
2 changed files with 11 additions and 1 deletions
|
@ -1294,7 +1294,7 @@ static int stk_register_video_device(struct stk_camera *dev)
|
||||||
|
|
||||||
dev->vdev = stk_v4l_data;
|
dev->vdev = stk_v4l_data;
|
||||||
dev->vdev.debug = debug;
|
dev->vdev.debug = debug;
|
||||||
dev->vdev.parent = &dev->interface->dev;
|
dev->vdev.v4l2_dev = &dev->v4l2_dev;
|
||||||
err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
|
err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1);
|
||||||
if (err)
|
if (err)
|
||||||
STK_ERROR("v4l registration failed\n");
|
STK_ERROR("v4l registration failed\n");
|
||||||
|
@ -1323,6 +1323,12 @@ static int stk_camera_probe(struct usb_interface *interface,
|
||||||
STK_ERROR("Out of memory !\n");
|
STK_ERROR("Out of memory !\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
err = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
|
||||||
|
if (err < 0) {
|
||||||
|
dev_err(&udev->dev, "couldn't register v4l2_device\n");
|
||||||
|
kfree(dev);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
spin_lock_init(&dev->spinlock);
|
spin_lock_init(&dev->spinlock);
|
||||||
init_waitqueue_head(&dev->wait_frame);
|
init_waitqueue_head(&dev->wait_frame);
|
||||||
|
@ -1383,6 +1389,7 @@ static int stk_camera_probe(struct usb_interface *interface,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error:
|
error:
|
||||||
|
v4l2_device_unregister(&dev->v4l2_dev);
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -1400,6 +1407,7 @@ static void stk_camera_disconnect(struct usb_interface *interface)
|
||||||
video_device_node_name(&dev->vdev));
|
video_device_node_name(&dev->vdev));
|
||||||
|
|
||||||
video_unregister_device(&dev->vdev);
|
video_unregister_device(&dev->vdev);
|
||||||
|
v4l2_device_unregister(&dev->v4l2_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#define STKWEBCAM_H
|
#define STKWEBCAM_H
|
||||||
|
|
||||||
#include <linux/usb.h>
|
#include <linux/usb.h>
|
||||||
|
#include <media/v4l2-device.h>
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
|
|
||||||
#define DRIVER_VERSION "v0.0.1"
|
#define DRIVER_VERSION "v0.0.1"
|
||||||
|
@ -91,6 +92,7 @@ struct regval {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct stk_camera {
|
struct stk_camera {
|
||||||
|
struct v4l2_device v4l2_dev;
|
||||||
struct video_device vdev;
|
struct video_device vdev;
|
||||||
struct usb_device *udev;
|
struct usb_device *udev;
|
||||||
struct usb_interface *interface;
|
struct usb_interface *interface;
|
||||||
|
|
Loading…
Reference in a new issue