diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-10-23 07:18:56 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-12-12 09:47:02 -0500 |
commit | 60a74a6ff86b4e90b9558956589390efdeb4e924 (patch) | |
tree | 188cfc02511b8e8a21e324efd9046f9e5b8c097a /drivers/firewire | |
parent | 9993e0fe0f5f29c69e79efcb271ffc9843002985 (diff) |
firewire: nosy: char device is not seekable
Amend .open handler accordingly and remove the .llseek handler.
.llseek = NULL means no_llseek (return error) since commit 776c163b1b93.
The only client that uses this interface is nosy-dump in linux/tools/firewire
and it knows not to seek in this char dev.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/nosy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c index bf184fb59a5e..0618145376ad 100644 --- a/drivers/firewire/nosy.c +++ b/drivers/firewire/nosy.c | |||
@@ -302,7 +302,7 @@ nosy_open(struct inode *inode, struct file *file) | |||
302 | 302 | ||
303 | file->private_data = client; | 303 | file->private_data = client; |
304 | 304 | ||
305 | return 0; | 305 | return nonseekable_open(inode, file); |
306 | fail: | 306 | fail: |
307 | kfree(client); | 307 | kfree(client); |
308 | lynx_put(lynx); | 308 | lynx_put(lynx); |
@@ -405,7 +405,6 @@ static const struct file_operations nosy_ops = { | |||
405 | .poll = nosy_poll, | 405 | .poll = nosy_poll, |
406 | .open = nosy_open, | 406 | .open = nosy_open, |
407 | .release = nosy_release, | 407 | .release = nosy_release, |
408 | .llseek = noop_llseek, | ||
409 | }; | 408 | }; |
410 | 409 | ||
411 | #define PHY_PACKET_SIZE 12 /* 1 payload, 1 inverse, 1 ack = 3 quadlets */ | 410 | #define PHY_PACKET_SIZE 12 /* 1 payload, 1 inverse, 1 ack = 3 quadlets */ |