Merge commit 'v2.6.26-rc9' into cpus4096

2 files changed, 11 insertions, 24 deletions

diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index d3999a8e9f88..53f6ad1235db 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -462,11 +462,11 @@ static int hycapi_read_proc(char *page, char **start, off_t off,
                 default: s = "???"; break;
         }
         len += sprintf(page+len, "%-16s %s\n", "type", s);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
                 len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
                 len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
                 len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
     
         len += sprintf(page+len, "%-16s %s\n", "cardname", cinfo->cardname);
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 15906d005b05..484299b031f8 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -207,30 +207,17 @@ hysdn_conf_write(struct file *file, const char __user *buf, size_t count, loff_t
 /* 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 */
-
-        return (i);
+        if (!(file->f_mode & FMODE_READ))
+                return -EPERM;  /* no permission to read */
+
+        if (!(cp = file->private_data))
+                return -EFAULT; /* should never happen */
+
+        return simple_read_from_buffer(buf, count, off, cp, strlen(cp));
 }                               /* hysdn_conf_read */
 
 /******************/