git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bw-qcam.c
diff --git
a/drivers/media/video/bw-qcam.c
b/drivers/media/video/bw-qcam.c
index
17f80d0
..
9e39bc5
100644
(file)
--- a/
drivers/media/video/bw-qcam.c
+++ b/
drivers/media/video/bw-qcam.c
@@
-706,7
+706,7
@@
static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l
* Video4linux interfacing
*/
* Video4linux interfacing
*/
-static
int
qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
+static
long
qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam=(struct qcam_device *)dev;
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam=(struct qcam_device *)dev;
@@
-863,7
+863,7
@@
static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg)
return 0;
}
return 0;
}
-static
int qcam_ioctl(struct inode *inode,
struct file *file,
+static
long qcam_ioctl(
struct file *file,
unsigned int cmd, unsigned long arg)
{
return video_usercopy(file, cmd, arg, qcam_do_ioctl);
unsigned int cmd, unsigned long arg)
{
return video_usercopy(file, cmd, arg, qcam_do_ioctl);
@@
-893,7
+893,7
@@
static ssize_t qcam_read(struct file *file, char __user *buf,
return len;
}
return len;
}
-static int qcam_exclusive_open(struct
inode *inode, struct
file *file)
+static int qcam_exclusive_open(struct file *file)
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam = (struct qcam_device *)dev;
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam = (struct qcam_device *)dev;
@@
-901,7
+901,7
@@
static int qcam_exclusive_open(struct inode *inode, struct file *file)
return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
}
return test_and_set_bit(0, &qcam->in_use) ? -EBUSY : 0;
}
-static int qcam_exclusive_release(struct
inode *inode, struct
file *file)
+static int qcam_exclusive_release(struct file *file)
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam = (struct qcam_device *)dev;
{
struct video_device *dev = video_devdata(file);
struct qcam_device *qcam = (struct qcam_device *)dev;
@@
-910,16
+910,12
@@
static int qcam_exclusive_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-static const struct file_operations qcam_fops = {
+static const struct
v4l2_
file_operations qcam_fops = {
.owner = THIS_MODULE,
.open = qcam_exclusive_open,
.release = qcam_exclusive_release,
.ioctl = qcam_ioctl,
.owner = THIS_MODULE,
.open = qcam_exclusive_open,
.release = qcam_exclusive_release,
.ioctl = qcam_ioctl,
-#ifdef CONFIG_COMPAT
- .compat_ioctl = v4l_compat_ioctl32,
-#endif
.read = qcam_read,
.read = qcam_read,
- .llseek = no_llseek,
};
static struct video_device qcam_template=
{
};
static struct video_device qcam_template=
{
@@
-996,7
+992,7
@@
static int accept_bwqcam(struct parport *port)
if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
/* user gave parport parameters */
if (parport[0] && strncmp(parport[0], "auto", 4) != 0) {
/* user gave parport parameters */
- for
(n=0; parport[n] && n<MAX_CAMS; n++)
{
+ for
(n = 0; n < MAX_CAMS && parport[n]; n++)
{
char *ep;
unsigned long r;
r = simple_strtoul(parport[n], &ep, 0);
char *ep;
unsigned long r;
r = simple_strtoul(parport[n], &ep, 0);