aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bw-qcam.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bw-qcam.c')
-rw-r--r--drivers/media/video/bw-qcam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index c1193506131c..f09df9dffaae 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -71,7 +71,6 @@ OTHER DEALINGS IN THE SOFTWARE.
71#include <linux/mm.h> 71#include <linux/mm.h>
72#include <linux/parport.h> 72#include <linux/parport.h>
73#include <linux/sched.h> 73#include <linux/sched.h>
74#include <linux/version.h>
75#include <linux/videodev2.h> 74#include <linux/videodev2.h>
76#include <linux/mutex.h> 75#include <linux/mutex.h>
77#include <asm/uaccess.h> 76#include <asm/uaccess.h>
@@ -647,7 +646,6 @@ static int qcam_querycap(struct file *file, void *priv,
647 strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver)); 646 strlcpy(vcap->driver, qcam->v4l2_dev.name, sizeof(vcap->driver));
648 strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card)); 647 strlcpy(vcap->card, "B&W Quickcam", sizeof(vcap->card));
649 strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info)); 648 strlcpy(vcap->bus_info, "parport", sizeof(vcap->bus_info));
650 vcap->version = KERNEL_VERSION(0, 0, 2);
651 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE; 649 vcap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
652 return 0; 650 return 0;
653} 651}
@@ -895,6 +893,7 @@ static struct qcam *qcam_init(struct parport *port)
895 893
896 if (v4l2_device_register(NULL, v4l2_dev) < 0) { 894 if (v4l2_device_register(NULL, v4l2_dev) < 0) {
897 v4l2_err(v4l2_dev, "Could not register v4l2_device\n"); 895 v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
896 kfree(qcam);
898 return NULL; 897 return NULL;
899 } 898 }
900 899
@@ -1092,3 +1091,4 @@ module_init(init_bw_qcams);
1092module_exit(exit_bw_qcams); 1091module_exit(exit_bw_qcams);
1093 1092
1094MODULE_LICENSE("GPL"); 1093MODULE_LICENSE("GPL");
1094MODULE_VERSION("0.0.3");