lkml.org 
[lkml]   [2008]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch -v3 04/22] isdn: use simple_read_from_buffer
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Acked-by: Karsten Keil <kkeil@suse.de>
    ---
    drivers/isdn/hysdn/hysdn_procconf.c | 27 +++++++--------------------
    1 file changed, 7 insertions(+), 20 deletions(-)

    Index: 2.6-git/drivers/isdn/hysdn/hysdn_procconf.c
    ===================================================================
    --- 2.6-git.orig/drivers/isdn/hysdn/hysdn_procconf.c
    +++ 2.6-git/drivers/isdn/hysdn/hysdn_procconf.c
    @@ -207,30 +207,17 @@ hysdn_conf_write(struct file *file, cons
    /* read conf file -> output card info data */
    /*******************************************/
    static ssize_t
    -hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t * off)
    +hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t *off)
    {
    char *cp;
    - int i;

    - if (file->f_mode & FMODE_READ) {
    - if (!(cp = file->private_data))
    - return (-EFAULT); /* should never happen */
    - i = strlen(cp); /* get total string length */
    - if (*off < i) {
    - /* still bytes to transfer */
    - cp += *off; /* point to desired data offset */
    - i -= *off; /* remaining length */
    - if (i > count)
    - i = count; /* limit length to transfer */
    - if (copy_to_user(buf, cp, i))
    - return (-EFAULT); /* copy error */
    - *off += i; /* adjust offset */
    - } else
    - return (0);
    - } else
    - return (-EPERM); /* no permission to read */
    + if (!(file->f_mode & FMODE_READ))
    + return -EPERM; /* no permission to read */

    - return (i);
    + if (!(cp = file->private_data))
    + return -EFAULT; /* should never happen */
    +
    + return simple_read_from_buffer(buf, count, off, cp, strlen(cp));
    } /* hysdn_conf_read */

    /******************/
    --


    \
     
     \ /
      Last update: 2008-06-04 14:15    [W:0.026 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site