summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2010-10-23 13:18:56 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-12-12 15:47:02 +0100
commit60a74a6ff86b4e90b9558956589390efdeb4e924 (patch)
tree188cfc02511b8e8a21e324efd9046f9e5b8c097a /drivers/firewire
parentfirewire: ohci: fix regression with Agere FW643 rev 06, disable MSI (diff)
downloadlinux-60a74a6ff86b4e90b9558956589390efdeb4e924.tar.xz
linux-60a74a6ff86b4e90b9558956589390efdeb4e924.zip
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.c3
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)
file->private_data = client;
- return 0;
+ return nonseekable_open(inode, file);
fail:
kfree(client);
lynx_put(lynx);
@@ -405,7 +405,6 @@ static const struct file_operations nosy_ops = {
.poll = nosy_poll,
.open = nosy_open,
.release = nosy_release,
- .llseek = noop_llseek,
};
#define PHY_PACKET_SIZE 12 /* 1 payload, 1 inverse, 1 ack = 3 quadlets */