git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
usb
/
media
/
dabusb.c
diff --git
a/drivers/usb/media/dabusb.c
b/drivers/usb/media/dabusb.c
index
4510ace
..
0e5425f
100644
(file)
--- a/
drivers/usb/media/dabusb.c
+++ b/
drivers/usb/media/dabusb.c
@@
-61,7
+61,7
@@
static dabusb_t dabusb[NRDABUSB];
static int buffers = 256;
static dabusb_t dabusb[NRDABUSB];
static int buffers = 256;
-
extern
struct usb_driver dabusb_driver;
+
static
struct usb_driver dabusb_driver;
/*-------------------------------------------------------------------*/
/*-------------------------------------------------------------------*/
@@
-476,7
+476,7
@@
static int dabusb_startrek (pdabusb_t s)
return 0;
}
return 0;
}
-static ssize_t dabusb_read (struct file *file, char *buf, size_t count, loff_t * ppos)
+static ssize_t dabusb_read (struct file *file, char
__user
*buf, size_t count, loff_t * ppos)
{
pdabusb_t s = (pdabusb_t) file->private_data;
unsigned long flags;
{
pdabusb_t s = (pdabusb_t) file->private_data;
unsigned long flags;
@@
-616,7
+616,7
@@
static int dabusb_open (struct inode *inode, struct file *file)
file->f_pos = 0;
file->private_data = s;
file->f_pos = 0;
file->private_data = s;
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int dabusb_release (struct inode *inode, struct file *file)
}
static int dabusb_release (struct inode *inode, struct file *file)
@@
-670,7
+670,7
@@
static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
break;
}
break;
}
- if (copy_from_user (pbulk, (void *) arg, sizeof (bulk_transfer_t))) {
+ if (copy_from_user (pbulk, (void
__user
*) arg, sizeof (bulk_transfer_t))) {
ret = -EFAULT;
kfree (pbulk);
break;
ret = -EFAULT;
kfree (pbulk);
break;
@@
-678,18
+678,18
@@
static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
ret=dabusb_bulk (s, pbulk);
if(ret==0)
ret=dabusb_bulk (s, pbulk);
if(ret==0)
- if (copy_to_user((void *)arg, pbulk,
+ if (copy_to_user((void
__user
*)arg, pbulk,
sizeof(bulk_transfer_t)))
ret = -EFAULT;
kfree (pbulk);
break;
case IOCTL_DAB_OVERRUNS:
sizeof(bulk_transfer_t)))
ret = -EFAULT;
kfree (pbulk);
break;
case IOCTL_DAB_OVERRUNS:
- ret = put_user (s->overruns, (unsigned int *) arg);
+ ret = put_user (s->overruns, (unsigned int
__user
*) arg);
break;
case IOCTL_DAB_VERSION:
break;
case IOCTL_DAB_VERSION:
- ret = put_user (version, (unsigned int *) arg);
+ ret = put_user (version, (unsigned int
__user
*) arg);
break;
default:
break;
default:
@@
-868,7
+868,7
@@
MODULE_AUTHOR( DRIVER_AUTHOR );
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");
-
MODULE_PARM (buffers, "i"
);
+
module_param(buffers, int, 0
);
MODULE_PARM_DESC (buffers, "Number of buffers (default=256)");
module_init (dabusb_init);
MODULE_PARM_DESC (buffers, "Number of buffers (default=256)");
module_init (dabusb_init);