Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638

[mv-sheeva.git] / drivers / firewire / nosy.c

diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index bf184fb59a5e4329ca11a391cefdc011ea050dfd..0618145376ade6b4608cd16792408f6e2b94ee23 100644 (file)
--- 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 */