diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:18:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:18:06 -0300 |
| commit | 18928f84d7e9e4c5ee002d2127f28a3ea8daf8db (patch) | |
| tree | 19e2cd4e514586be67c37c0d8ec3df78a1948d36 /v4l_experimental/firesat/firesat-ci.c | |
| parent | 6c9a1ff458d27546b0417368fe92a1442a0a609d (diff) | |
| parent | 04e2c76f8d845ee90c1e85ee6a170618b22ff933 (diff) | |
| download | mediapointer-dvb-s2-18928f84d7e9e4c5ee002d2127f28a3ea8daf8db.tar.gz mediapointer-dvb-s2-18928f84d7e9e4c5ee002d2127f28a3ea8daf8db.tar.bz2 | |
merge: http://linuxtv.org/hg/~manu/v4l-algo
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l_experimental/firesat/firesat-ci.c')
| -rw-r--r-- | v4l_experimental/firesat/firesat-ci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/v4l_experimental/firesat/firesat-ci.c b/v4l_experimental/firesat/firesat-ci.c index 1fd96cf63..3d005cb56 100644 --- a/v4l_experimental/firesat/firesat-ci.c +++ b/v4l_experimental/firesat/firesat-ci.c @@ -11,7 +11,7 @@ static int firesat_ca_do_ioctl(struct inode *inode, struct file *file, unsigned int err; // printk(KERN_INFO "%s: ioctl %d\n",__FUNCTION__,cmd); - + switch(cmd) { case CA_RESET: err = AVCResetTPDU(firesat); @@ -67,7 +67,7 @@ static ssize_t firesat_ca_io_read(struct file *file, char __user *buf, size_t co struct firesat *firesat = (struct firesat*)((struct dvb_device*)file->private_data)->priv; char *data=kmalloc(count,GFP_KERNEL); // printk(KERN_INFO "%s: count = %d\n",__FUNCTION__,count); - int r=AVCReadTPDU(firesat, data, &count); + int r=AVCReadTPDU(firesat, data, &count); if(!r) { copy_to_user(buf,data,count); kfree(data); @@ -77,9 +77,9 @@ static ssize_t firesat_ca_io_read(struct file *file, char __user *buf, size_t co return 0; } -static int firesat_ca_io_open(struct inode *inode, struct file *file) { +static int firesat_ca_io_open(struct inode *inode, struct file *file) { printk(KERN_INFO "%s!\n",__FUNCTION__); - return dvb_generic_open(inode, file); + return dvb_generic_open(inode, file); } static int firesat_ca_io_release(struct inode *inode, struct file *file) { @@ -89,7 +89,7 @@ static int firesat_ca_io_release(struct inode *inode, struct file *file) { static unsigned int firesat_ca_io_poll(struct file *file, poll_table *wait) { // printk(KERN_INFO "%s!\n",__FUNCTION__); - return POLLIN; + return POLLIN; } static struct file_operations firesat_ca_fops = { |