Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 285696
b: refs/heads/master
c: 76ae853
h: refs/heads/master
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent 6001b76 commit 13ca0e1
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 47 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ee186fd96a5f98f971316d26822b94c331d56a57
refs/heads/master: 76ae853844dff124559e1b609b0c71c792a98221
75 changes: 29 additions & 46 deletions trunk/drivers/media/video/pwc/pwc-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,15 @@ static struct {

/***/

static int pwc_video_open(struct file *file);
static int pwc_video_close(struct file *file);
static ssize_t pwc_video_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos);
static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma);
static void pwc_video_release(struct video_device *vfd);

static const struct v4l2_file_operations pwc_fops = {
.owner = THIS_MODULE,
.open = pwc_video_open,
.open = v4l2_fh_open,
.release = pwc_video_close,
.read = pwc_video_read,
.poll = pwc_video_poll,
Expand All @@ -163,7 +161,7 @@ static const struct v4l2_file_operations pwc_fops = {
};
static struct video_device pwc_template = {
.name = "Philips Webcam", /* Filled in later */
.release = pwc_video_release,
.release = video_device_release_empty,
.fops = &pwc_fops,
.ioctl_ops = &pwc_ioctl_ops,
};
Expand Down Expand Up @@ -644,25 +642,9 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
/***************************************************************************/
/* Video4Linux functions */

static int pwc_video_open(struct file *file)
static void pwc_video_release(struct v4l2_device *v)
{
struct video_device *vdev = video_devdata(file);
struct pwc_device *pdev;

PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev);

pdev = video_get_drvdata(vdev);
if (!pdev->udev)
return -ENODEV;

file->private_data = vdev;
PWC_DEBUG_OPEN("<< video_open() returns 0.\n");
return 0;
}

static void pwc_video_release(struct video_device *vfd)
{
struct pwc_device *pdev = container_of(vfd, struct pwc_device, vdev);
struct pwc_device *pdev = container_of(v, struct pwc_device, v4l2_dev);
int hint;

/* search device_hint[] table if we occupy a slot, by any chance */
Expand All @@ -685,26 +667,19 @@ static void pwc_video_release(struct video_device *vfd)

static int pwc_video_close(struct file *file)
{
struct video_device *vdev = file->private_data;
struct pwc_device *pdev;

PWC_DEBUG_OPEN(">> video_close called(vdev = 0x%p).\n", vdev);
struct pwc_device *pdev = video_drvdata(file);

pdev = video_get_drvdata(vdev);
if (pdev->capt_file == file) {
vb2_queue_release(&pdev->vb_queue);
pdev->capt_file = NULL;
}

PWC_DEBUG_OPEN("<< video_close()\n");
return 0;
return v4l2_fh_release(file);
}

static ssize_t pwc_video_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
struct video_device *vdev = file->private_data;
struct pwc_device *pdev = video_get_drvdata(vdev);
struct pwc_device *pdev = video_drvdata(file);

if (!pdev->udev)
return -ENODEV;
Expand All @@ -721,8 +696,7 @@ static ssize_t pwc_video_read(struct file *file, char __user *buf,

static unsigned int pwc_video_poll(struct file *file, poll_table *wait)
{
struct video_device *vdev = file->private_data;
struct pwc_device *pdev = video_get_drvdata(vdev);
struct pwc_device *pdev = video_drvdata(file);

if (!pdev->udev)
return POLL_ERR;
Expand All @@ -732,8 +706,7 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)

static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
{
struct video_device *vdev = file->private_data;
struct pwc_device *pdev = video_get_drvdata(vdev);
struct pwc_device *pdev = video_drvdata(file);

if (pdev->capt_file != file)
return -EBUSY;
Expand Down Expand Up @@ -1185,9 +1158,9 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id

/* Init video_device structure */
memcpy(&pdev->vdev, &pwc_template, sizeof(pwc_template));
pdev->vdev.parent = &intf->dev;
pdev->vdev.lock = &pdev->modlock;
strcpy(pdev->vdev.name, name);
set_bit(V4L2_FL_USE_FH_PRIO, &pdev->vdev.flags);
video_set_drvdata(&pdev->vdev, pdev);

pdev->release = le16_to_cpu(udev->descriptor.bcdDevice);
Expand All @@ -1211,9 +1184,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
if (hint < MAX_DEV_HINTS)
device_hint[hint].pdev = pdev;

PWC_DEBUG_PROBE("probe() function returning struct at 0x%p.\n", pdev);
usb_set_intfdata(intf, pdev);

#ifdef CONFIG_USB_PWC_DEBUG
/* Query sensor type */
if (pwc_get_cmos_sensor(pdev, &rc) >= 0) {
Expand All @@ -1239,15 +1209,24 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
goto err_free_mem;
}

pdev->vdev.ctrl_handler = &pdev->ctrl_handler;

/* And powerdown the camera until streaming starts */
pwc_camera_power(pdev, 0);

/* Register the v4l2_device structure */
pdev->v4l2_dev.release = pwc_video_release;
rc = v4l2_device_register(&intf->dev, &pdev->v4l2_dev);
if (rc) {
PWC_ERROR("Failed to register v4l2-device (%d).\n", rc);
goto err_free_controls;
}

pdev->v4l2_dev.ctrl_handler = &pdev->ctrl_handler;
pdev->vdev.v4l2_dev = &pdev->v4l2_dev;

rc = video_register_device(&pdev->vdev, VFL_TYPE_GRABBER, video_nr);
if (rc < 0) {
PWC_ERROR("Failed to register as video device (%d).\n", rc);
goto err_free_controls;
goto err_unregister_v4l2_dev;
}
rc = pwc_create_sysfs_files(pdev);
if (rc)
Expand Down Expand Up @@ -1290,23 +1269,24 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
if (hint < MAX_DEV_HINTS)
device_hint[hint].pdev = NULL;
video_unregister_device(&pdev->vdev);
err_unregister_v4l2_dev:
v4l2_device_unregister(&pdev->v4l2_dev);
err_free_controls:
v4l2_ctrl_handler_free(&pdev->ctrl_handler);
err_free_mem:
usb_set_intfdata(intf, NULL);
kfree(pdev);
return rc;
}

/* The user yanked out the cable... */
static void usb_pwc_disconnect(struct usb_interface *intf)
{
struct pwc_device *pdev = usb_get_intfdata(intf);
struct v4l2_device *v = usb_get_intfdata(intf);
struct pwc_device *pdev = container_of(v, struct pwc_device, v4l2_dev);

mutex_lock(&pdev->udevlock);
mutex_lock(&pdev->modlock);

usb_set_intfdata(intf, NULL);
/* No need to keep the urbs around after disconnection */
pwc_isoc_cleanup(pdev);
pwc_cleanup_queued_bufs(pdev);
Expand All @@ -1317,11 +1297,14 @@ static void usb_pwc_disconnect(struct usb_interface *intf)

pwc_remove_sysfs_files(pdev);
video_unregister_device(&pdev->vdev);
v4l2_device_unregister(&pdev->v4l2_dev);

#ifdef CONFIG_USB_PWC_INPUT_EVDEV
if (pdev->button_dev)
input_unregister_device(pdev->button_dev);
#endif

v4l2_device_put(&pdev->v4l2_dev);
}


Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/media/video/pwc/pwc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
#include <asm/errno.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-fh.h>
#include <media/v4l2-event.h>
#include <media/videobuf2-vmalloc.h>
#ifdef CONFIG_USB_PWC_INPUT_EVDEV
#include <linux/input.h>
Expand Down Expand Up @@ -198,6 +201,7 @@ struct pwc_frame_buf
struct pwc_device
{
struct video_device vdev;
struct v4l2_device v4l2_dev;
struct mutex modlock;

/* Pointer to our usb_device, may be NULL after unplug */
Expand Down

0 comments on commit 13ca0e1

Please sign in to comment.