Merge 3.6-rc3 into tty-next

This picks up all of the different fixes in Linus's tree that we also need here.

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

3 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index a561ae44a9ac..c6a0299aa9f9 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -158,7 +158,7 @@ static int bfin_sir_set_speed(struct bfin_sir_port *port, int speed)
         /* If not add the 'RPOLC', we can't catch the receive interrupt.
          * It's related with the HW layout and the IR transiver.
          */
-        val |= IREN | RPOLC;
+        val |= UMOD_IRDA | RPOLC;
         UART_PUT_GCTL(port, val);
         return ret;
 }
@@ -432,7 +432,7 @@ static void bfin_sir_shutdown(struct bfin_sir_port *port, struct net_device *dev
         bfin_sir_stop_rx(port);
 
         val = UART_GET_GCTL(port);
-        val &= ~(UCEN | IREN | RPOLC);
+        val &= ~(UCEN | UMOD_MASK | RPOLC);
         UART_PUT_GCTL(port, val);
 
 #ifdef CONFIG_SIR_BFIN_DMA
@@ -518,10 +518,10 @@ static void bfin_sir_send_work(struct work_struct *work)
          * reset all the UART.
          */
         val = UART_GET_GCTL(port);
-        val &= ~(IREN | RPOLC);
+        val &= ~(UMOD_MASK | RPOLC);
         UART_PUT_GCTL(port, val);
         SSYNC();
-        val |= IREN | RPOLC;
+        val |= UMOD_IRDA | RPOLC;
         UART_PUT_GCTL(port, val);
         SSYNC();
         /* bfin_sir_set_speed(port, self->speed); */
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 824e2a93fe8a..5f3aeac3f86d 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -542,6 +542,7 @@ static int ks959_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
+                err = -ENOMEM;
                 dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 5a278ab83c2f..2d4b6a1ab202 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -436,6 +436,7 @@ static int ksdazzle_net_open(struct net_device *netdev)
         sprintf(hwname, "usb#%d", kingsun->usbdev->devnum);
         kingsun->irlap = irlap_open(netdev, &kingsun->qos, hwname);
         if (!kingsun->irlap) {
+                err = -ENOMEM;
                 dev_err(&kingsun->usbdev->dev, "irlap_open failed\n");
                 goto free_mem;
         }