diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 10:52:56 -0700 |
| commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
| tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/telephony | |
| parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
| parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) | |
| download | linux-092e0e7e520a1fca03e13c9f2d157432a8657ff2.tar.bz2 | |
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
vfs: make no_llseek the default
vfs: don't use BKL in default_llseek
llseek: automatically add .llseek fop
libfs: use generic_file_llseek for simple_attr
mac80211: disallow seeks in minstrel debug code
lirc: make chardev nonseekable
viotape: use noop_llseek
raw: use explicit llseek file operations
ibmasmfs: use generic_file_llseek
spufs: use llseek in all file operations
arm/omap: use generic_file_llseek in iommu_debug
lkdtm: use generic_file_llseek in debugfs
net/wireless: use generic_file_llseek in debugfs
drm: use noop_llseek
Diffstat (limited to 'drivers/telephony')
| -rw-r--r-- | drivers/telephony/ixj.c | 3 | ||||
| -rw-r--r-- | drivers/telephony/phonedev.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index b1e469983b1d..0d236f4bb8c2 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -6677,7 +6677,8 @@ static const struct file_operations ixj_fops = .poll = ixj_poll, .unlocked_ioctl = ixj_ioctl, .release = ixj_release, - .fasync = ixj_fasync + .fasync = ixj_fasync, + .llseek = default_llseek, }; static int ixj_linetest(IXJ *j) diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index f3873f650bb4..1915af201175 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c @@ -130,6 +130,7 @@ static const struct file_operations phone_fops = { .owner = THIS_MODULE, .open = phone_open, + .llseek = noop_llseek, }; /* |