Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6 files changed, 39 insertions, 15 deletions

diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 27e4a3e21d64..68452b768da2 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -288,6 +288,7 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,
  * format CAPI IE as string
  */
 
+#ifdef CONFIG_GIGASET_DEBUG
 static const char *format_ie(const char *ie)
 {
         static char result[3 * MAX_FMT_IE_LEN];
@@ -313,6 +314,7 @@ static const char *format_ie(const char *ie)
         *--pout = 0;
         return result;
 }
+#endif
 
 /*
  * emit DATA_B3_CONF message
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index c08fc605e56b..fa6ca4733725 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
 {
         struct fritzcard *fc = bch->hw;
         struct hdlc_hw *hdlc;
-        int count, fs, cnt = 0, idx, fillempty = 0;
+        int count, fs, cnt = 0, idx;
+        bool fillempty = false;
         u8 *p;
         u32 *ptr, val, addr;
 
@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
                         return;
                 count = fs;
                 p = bch->fill;
-                fillempty = 1;
+                fillempty = true;
         } else {
                 count = bch->tx_skb->len - bch->tx_idx;
                 if (count <= 0)
@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
                         hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
         }
         ptr = (u32 *)p;
-        if (fillempty) {
+        if (!fillempty) {
                 pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
                          bch->tx_idx, bch->tx_skb->len);
                 bch->tx_idx += count;
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index c65c3440cd70..114f3bcba1b0 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -2084,13 +2084,21 @@ hfcsusb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         /* create the control pipes needed for register access */
         hw->ctrl_in_pipe = usb_rcvctrlpipe(hw->dev, 0);
         hw->ctrl_out_pipe = usb_sndctrlpipe(hw->dev, 0);
+
+        driver_info = (struct hfcsusb_vdata *)
+                      hfcsusb_idtab[vend_idx].driver_info;
+
         hw->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!hw->ctrl_urb) {
+                pr_warn("%s: No memory for control urb\n",
+                        driver_info->vend_name);
+                kfree(hw);
+                return -ENOMEM;
+        }
 
-        driver_info =
-                (struct hfcsusb_vdata *)hfcsusb_idtab[vend_idx].driver_info;
-        printk(KERN_DEBUG "%s: %s: detected \"%s\" (%s, if=%d alt=%d)\n",
-               hw->name, __func__, driver_info->vend_name,
-               conf_str[small_match], ifnum, alt_used);
+        pr_info("%s: %s: detected \"%s\" (%s, if=%d alt=%d)\n",
+                hw->name, __func__, driver_info->vend_name,
+                conf_str[small_match], ifnum, alt_used);
 
         if (setup_instance(hw, dev->dev.parent))
                 return -EIO;
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 84f9c8103078..849a80752685 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1483,13 +1483,21 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                 usb_rcvctrlpipe(context->dev, 0);
                         context->ctrl_out_pipe =
                                 usb_sndctrlpipe(context->dev, 0);
+
+                        driver_info = (hfcsusb_vdata *)
+                                      hfcusb_idtab[vend_idx].driver_info;
+
                         context->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
 
-                        driver_info =
-                                (hfcsusb_vdata *) hfcusb_idtab[vend_idx].
-                                driver_info;
-                        printk(KERN_INFO "HFC-S USB: detected \"%s\"\n",
-                               driver_info->vend_name);
+                        if (!context->ctrl_urb) {
+                                pr_warn("%s: No memory for control urb\n",
+                                        driver_info->vend_name);
+                                kfree(context);
+                                return -ENOMEM;
+                        }
+
+                        pr_info("HFC-S USB: detected \"%s\"\n",
+                                driver_info->vend_name);
 
                         DBG(HFCUSB_DBG_INIT,
                             "HFC-S USB: Endpoint-Config: %s (if=%d alt=%d), E-Channel(%d)",
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index ea2717215296..c1530fe248c2 100644
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -231,6 +231,11 @@ setup_isurf(struct IsdnCard *card)
                                 }
                                 pnp_disable_dev(pnp_d);
                                 err = pnp_activate_dev(pnp_d);
+                                if (err < 0) {
+                                        pr_warn("%s: pnp_activate_dev ret=%d\n",
+                                                __func__, err);
+                                        return 0;
+                                }
                                 cs->hw.isurf.reset = pnp_port_start(pnp_d, 0);
                                 cs->hw.isurf.phymem = pnp_mem_start(pnp_d, 1);
                                 cs->irq = pnp_irq(pnp_d, 0);
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index 1a0ae4445ff2..5f21f629b7ae 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -135,8 +135,8 @@ send_layer2(struct mISDNstack *st, struct sk_buff *skb)
                         skb = NULL;
                 else if (*debug & DEBUG_SEND_ERR)
                         printk(KERN_DEBUG
-                               "%s ch%d mgr prim(%x) addr(%x) err %d\n",
-                               __func__, ch->nr, hh->prim, ch->addr, ret);
+                               "%s mgr prim(%x) err %d\n",
+                               __func__, hh->prim, ret);
         }
 out:
         mutex_unlock(&st->lmutex);