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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvb_ca_en50221.c
diff --git
a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index
88ed3b9
..
a4c3794
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/
drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@
-621,7
+621,7
@@
static int dvb_ca_en50221_read_data(struct dvb_ca_private* ca, int slot, u8* ebu
/* OK, add it to the receive buffer, or copy into external buffer if supplied */
if (ebuf == NULL) {
/* OK, add it to the receive buffer, or copy into external buffer if supplied */
if (ebuf == NULL) {
- dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read
, 0
);
+ dvb_ringbuffer_pkt_write(&ca->slot_info[slot].rx_buffer, buf, bytes_read);
} else {
memcpy(ebuf, buf, bytes_read);
}
} else {
memcpy(ebuf, buf, bytes_read);
}
@@
-1188,7
+1188,7
@@
static int dvb_ca_en50221_io_ioctl(struct inode *inode, struct file *file, unsig
*
* @return Number of bytes read, or <0 on error.
*/
*
* @return Number of bytes read, or <0 on error.
*/
-static ssize_t dvb_ca_en50221_io_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_ca_en50221_io_write(struct file *file, const char
__user
*buf, size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dvb_ca_private *ca=(struct dvb_ca_private*) dvbdev->priv;
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dvb_ca_private *ca=(struct dvb_ca_private*) dvbdev->priv;
@@
-1303,7
+1303,7
@@
nextslot:
*
* @return Number of bytes read, or <0 on error.
*/
*
* @return Number of bytes read, or <0 on error.
*/
-static ssize_t dvb_ca_en50221_io_read(struct file *file, char *buf, size_t count, loff_t *ppos)
+static ssize_t dvb_ca_en50221_io_read(struct file *file, char
__user
*buf, size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dvb_ca_private *ca=(struct dvb_ca_private*) dvbdev->priv;
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dvb_ca_private *ca=(struct dvb_ca_private*) dvbdev->priv;
@@
-1494,7
+1494,7
@@
static struct file_operations dvb_ca_fops = {
};
static struct dvb_device dvbdev_ca = {
};
static struct dvb_device dvbdev_ca = {
- priv:
0
,
+ priv:
NULL
,
users: 1,
readers: 1,
writers: 1,
users: 1,
readers: 1,
writers: 1,