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 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[pandora-kernel.git]
/
drivers
/
ieee1394
/
video1394.c
diff --git
a/drivers/ieee1394/video1394.c
b/drivers/ieee1394/video1394.c
index
949064a
..
a42bd68
100644
(file)
--- a/
drivers/ieee1394/video1394.c
+++ b/
drivers/ieee1394/video1394.c
@@
-1239,7
+1239,7
@@
static int video1394_open(struct inode *inode, struct file *file)
ctx->current_ctx = NULL;
file->private_data = ctx;
ctx->current_ctx = NULL;
file->private_data = ctx;
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int video1394_release(struct inode *inode, struct file *file)
}
static int video1394_release(struct inode *inode, struct file *file)
@@
-1287,7
+1287,8
@@
static const struct file_operations video1394_fops=
.poll = video1394_poll,
.mmap = video1394_mmap,
.open = video1394_open,
.poll = video1394_poll,
.mmap = video1394_mmap,
.open = video1394_open,
- .release = video1394_release
+ .release = video1394_release,
+ .llseek = no_llseek,
};
/*** HOTPLUG STUFF **********************************************************/
};
/*** HOTPLUG STUFF **********************************************************/