Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 605 → Rev 606

/shark/trunk/drivers/linuxc26/videodev.c
385,7 → 385,11
}
 
extern int linuxcomp_setfd(struct inode *i, int i_rdev);
void *file = NULL;
 
int bttv_open(struct inode *inode, struct file *file);
/* Shark Inode emulation */
int videodev_open_inode(int num) {
392,10 → 396,11
struct inode *i;
i = (struct inode *)kmalloc(sizeof(struct inode),GFP_KERNEL);
if (file == NULL) file = (void *)kmalloc(50000,GFP_KERNEL);
linuxcomp_setfd(i,num);
if (video_open(i,NULL)) {
if (bttv_open(i,file)) {
kfree(i);
return -1;
}
417,7 → 422,7
linuxcomp_setfd(i,num);
res = bttv_ioctl(i,NULL,cmd,arg);
res = bttv_ioctl(i,file,cmd,arg);
kfree(i);
return res;