Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / drivers / isdn / capi / capi.c

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 42d7c6b..3429d57 100644 (file)
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -656,9 +656,6 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
        struct sk_buff *skb;
        size_t copied;
 
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
-
        if (!cdev->ap.applid)
                return -ENODEV;
 
@@ -699,9 +696,6 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos
        struct sk_buff *skb;
        u16 mlen;
 
-        if (ppos != &file->f_pos)
-               return -ESPIPE;
-
        if (!cdev->ap.applid)
                return -ENODEV;
 
@@ -965,7 +959,7 @@ capi_open(struct inode *inode, struct file *file)
        if ((file->private_data = capidev_alloc()) == 0)
                return -ENOMEM;
 
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int