Merge branch 'fix/misc' into topic/misc

3 files changed, 8 insertions, 6 deletions

diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index bde3c88b8b27..b054494df846 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -1020,12 +1020,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
                 if (cmd == AVMB1_ADDCARD) {
                    if ((retval = copy_from_user(&cdef, data,
                                             sizeof(avmb1_carddef))))
-                           return retval;
+                           return -EFAULT;
                    cdef.cardtype = AVM_CARDTYPE_B1;
                 } else {
                    if ((retval = copy_from_user(&cdef, data,
                                             sizeof(avmb1_extcarddef))))
-                           return retval;
+                           return -EFAULT;
                 }
                 cparams.port = cdef.port;
                 cparams.irq = cdef.irq;
@@ -1218,7 +1218,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
                 kcapi_carddef cdef;
 
                 if ((retval = copy_from_user(&cdef, data, sizeof(cdef))))
-                        return retval;
+                        return -EFAULT;
 
                 cparams.port = cdef.port;
                 cparams.irq = cdef.irq;
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index b3b7e2879bac..8700474747e8 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -97,8 +97,10 @@ static int write_reg(struct hfcsusb *hw, __u8 reg, __u8 val)
                         hw->name, __func__, reg, val);
 
         spin_lock(&hw->ctrl_lock);
-        if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE)
+        if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE) {
+                spin_unlock(&hw->ctrl_lock);
                 return 1;
+        }
         buf = &hw->ctrl_buff[hw->ctrl_in_idx];
         buf->hfcs_reg = reg;
         buf->reg_val = val;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index 0a3553df065f..54ae71a907f9 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -320,12 +320,12 @@ inittiger(struct tiger_hw *card)
                 return -ENOMEM;
         }
         for (i = 0; i < 2; i++) {
-                card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_KERNEL);
+                card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_ATOMIC);
                 if (!card->bc[i].hsbuf) {
                         pr_info("%s: no B%d send buffer\n", card->name, i + 1);
                         return -ENOMEM;
                 }
-                card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_KERNEL);
+                card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_ATOMIC);
                 if (!card->bc[i].hrbuf) {
                         pr_info("%s: no B%d recv buffer\n", card->name, i + 1);
                         return -ENOMEM;