Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_common.c

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index ec5f4046412fa564644619175c59373ab4ca39e3..9cef6fcf587b6baaef9df48c3616779262d6d3a9 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -914,6 +914,9 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack)
                        dflag = 0;
                        count_pull = count_put = 0;
                        while ((count_pull < skb->len) && (len > 0)) {
+                               /* push every character but the last to the tty buffer directly */
+                               if ( count_put )
+                                       tty_insert_flip_char(tty, last, TTY_NORMAL);
                                len--;
                                if (dev->drv[di]->DLEflag & DLEmask) {
                                        last = DLE;
@@ -1135,7 +1138,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
                        if (count > dev->drv[drvidx]->stavail)
                                count = dev->drv[drvidx]->stavail;
                        len = dev->drv[drvidx]->interface->readstat(buf, count,
-                                               drvidx, isdn_minor2chan(minor));
+                               drvidx, isdn_minor2chan(minor - ISDN_MINOR_CTRL));
                        if (len < 0) {
                                retval = len;
                                goto out;
@@ -1207,7 +1210,8 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
                 */
                if (dev->drv[drvidx]->interface->writecmd)
                        retval = dev->drv[drvidx]->interface->
-                               writecmd(buf, count, drvidx, isdn_minor2chan(minor));
+                               writecmd(buf, count, drvidx,
+                               isdn_minor2chan(minor - ISDN_MINOR_CTRL));
                else
                        retval = count;
                goto out;
@@ -1364,7 +1368,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                } else {
                                        s = NULL;
                                }
-                               ret = down_interruptible(&dev->sem);
+                               ret = mutex_lock_interruptible(&dev->mtx);
                                if( ret ) return ret;
                                if ((s = isdn_net_new(s, NULL))) {
                                        if (copy_to_user(argp, s, strlen(s) + 1)){
@@ -1374,7 +1378,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        }
                                } else
                                        ret = -ENODEV;
-                               up(&dev->sem);
+                               mutex_unlock(&dev->mtx);
                                return ret;
                        case IIOCNETASL:
                                /* Add a slave to a network-interface */
@@ -1383,7 +1387,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                                return -EFAULT;
                                } else
                                        return -EINVAL;
-                               ret = down_interruptible(&dev->sem);
+                               ret = mutex_lock_interruptible(&dev->mtx);
                                if( ret ) return ret;
                                if ((s = isdn_net_newslave(bname))) {
                                        if (copy_to_user(argp, s, strlen(s) + 1)){
@@ -1393,17 +1397,17 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        }
                                } else
                                        ret = -ENODEV;
-                               up(&dev->sem);
+                               mutex_unlock(&dev->mtx);
                                return ret;
                        case IIOCNETDIF:
                                /* Delete a network-interface */
                                if (arg) {
                                        if (copy_from_user(name, argp, sizeof(name)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_rm(name);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1432,10 +1436,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_addphone(&phone);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1444,10 +1448,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_getphones(&phone, argp);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1456,10 +1460,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_delphone(&phone);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1514,6 +1518,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        if (copy_from_user(&iocts, argp,
                                             sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                if ((p = strchr(iocts.drvid, ',')))
                                                        *p = 0;
@@ -1598,6 +1603,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        if (copy_from_user(&iocts, argp,
                                             sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                drvidx = -1;
                                                for (i = 0; i < ISDN_MAX_DRIVERS; i++)
@@ -1642,7 +1648,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        } else {
                                                p = (char __user *) iocts.arg;
                                                for (i = 0; i < 10; i++) {
-                                                       sprintf(bname, "%s%s",
+                                                       snprintf(bname, sizeof(bname), "%s%s",
                                                                strlen(dev->drv[drvidx]->msn2eaz[i]) ?
                                                                dev->drv[drvidx]->msn2eaz[i] : "_",
                                                                (i < 9) ? "," : "\0");
@@ -1672,6 +1678,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        char *p;
                                        if (copy_from_user(&iocts, argp, sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                if ((p = strchr(iocts.drvid, ',')))
                                                        *p = 0;
@@ -2303,7 +2310,7 @@ static int __init isdn_init(void)
 #ifdef MODULE
        dev->owner = THIS_MODULE;
 #endif
-       init_MUTEX(&dev->sem);
+       mutex_init(&dev->mtx);
        init_waitqueue_head(&dev->info_waitq);
        for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
                dev->drvmap[i] = -1;