|
@@ -27,7 +27,6 @@
|
|
|
#include <linux/kernel.h>
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/slab.h>
|
|
|
-#include <linux/kref.h>
|
|
|
|
|
|
#include <linux/usb.h>
|
|
|
#include <linux/mm.h>
|
|
@@ -714,9 +713,6 @@ static ssize_t v4l_stk_read(struct file *fp, char __user *buf,
|
|
|
struct stk_sio_buffer *sbuf;
|
|
|
struct stk_camera *dev = fp->private_data;
|
|
|
|
|
|
- if (dev == NULL)
|
|
|
- return -EIO;
|
|
|
-
|
|
|
if (!is_present(dev))
|
|
|
return -EIO;
|
|
|
if (dev->owner && dev->owner != fp)
|
|
@@ -773,9 +769,6 @@ static unsigned int v4l_stk_poll(struct file *fp, poll_table *wait)
|
|
|
{
|
|
|
struct stk_camera *dev = fp->private_data;
|
|
|
|
|
|
- if (dev == NULL)
|
|
|
- return -ENODEV;
|
|
|
-
|
|
|
poll_wait(fp, &dev->wait_frame, wait);
|
|
|
|
|
|
if (!is_present(dev))
|
|
@@ -1436,7 +1429,7 @@ static void stk_camera_disconnect(struct usb_interface *interface)
|
|
|
wake_up_interruptible(&dev->wait_frame);
|
|
|
stk_remove_sysfs_files(&dev->vdev);
|
|
|
|
|
|
- STK_INFO("Syntek USB2.0 Camera release resources"
|
|
|
+ STK_INFO("Syntek USB2.0 Camera release resources "
|
|
|
"video device /dev/video%d\n", dev->vdev.minor);
|
|
|
|
|
|
video_unregister_device(&dev->vdev);
|