19 files changed, 73 insertions, 16 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b53fdb0a282c..60cc54368b66 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -153,6 +153,12 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
         struct kvec iov;
         sigset_t blocked, oldset;
 
+        if (unlikely(!sock)) {
+                printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
+                       lo->disk->disk_name, (send ? "send" : "recv"));
+                return -EINVAL;
+        }
+
         /* Allow interception of SIGKILL only
          * Don't allow other signals to interrupt the transmission */
         siginitsetinv(&blocked, sigmask(SIGKILL));
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c
index d6567b32fb5c..9c25320121ef 100644
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/char/ip2/i2lib.c
@@ -644,12 +644,12 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
                                 // Normal Expected path - We still hold LOCK
                                 break; /* from for()- Enough room: goto proceed */
                         }
-                }
-
-                ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize );
+                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
+                        WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags);
+                } else
+                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
 
-                // Prepare to wait for buffers to empty
-                WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags); 
+                /* Prepare to wait for buffers to empty */
                 serviceOutgoingFifo(pB);        // Dump what we got
 
                 if (timeout == 0) {
@@ -1830,6 +1830,8 @@ i2StripFifo(i2eBordStrPtr pB)
                 default: // Neither packet? should be impossible
                         ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1,
                                 PTYPE_OF(pB->i2eLeadoffWord) );
+                        WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,
+                                        bflags);
 
                         break;
                 }  // End of switch on type of packets
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 991119c9f473..9b52892a501f 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -425,8 +425,10 @@ int RIOApel(struct rio_info *p)
 
                 MapP = &p->RIOConnectTable[Next++];
                 MapP->HostUniqueNum = HostP->UniqueNum;
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING)
+                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
+                        rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
                         continue;
+                }
                 MapP->RtaUniqueNum = 0;
                 MapP->ID = 0;
                 MapP->Flags = SLOT_IN_USE;
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index a4f0b1e3e7fa..cfa54361473f 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -319,6 +319,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
                         PortP->State |= RIO_WOPEN;
                         rio_spin_unlock_irqrestore(&PortP->portSem, flags);
                         if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
+                                rio_spin_lock_irqsave(&PortP->portSem, flags);
                                 /*
                                  ** ACTION: verify that this is a good thing
                                  ** to do here. -- ???
@@ -334,6 +335,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
                                 func_exit();
                                 return -EINTR;
                         }
+                        rio_spin_lock_irqsave(&PortP->portSem, flags);
                 }
                 PortP->State &= ~RIO_WOPEN;
         }
@@ -493,6 +495,7 @@ int riotclose(void *ptr)
 
         if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {
                 RIOPreemptiveCmd(p, PortP, FCLOSE);
+                rio_spin_lock_irqsave(&PortP->portSem, flags);
                 goto close_end;
         }
 
@@ -508,6 +511,7 @@ int riotclose(void *ptr)
 
                         if (p->RIOHalted) {
                                 RIOClearUp(PortP);
+                                rio_spin_lock_irqsave(&PortP->portSem, flags);
                                 goto close_end;
                         }
                         if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 43a70e91363e..be9ff7334c52 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
 }
 
 module_init(ide_arm_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index e79bf8f9b7db..c8ffbaf29a88 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
 }
 
 module_init(init_e100_ide);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 520aec075700..4108ec4ffa7f 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -110,6 +110,7 @@ static int __init h8300_ide_init(void)
         ide_init_port_data(hwif, index);
         ide_init_port_hw(hwif, &hw);
         hwif_setup(hwif);
+        hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;
         printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index);
 
         idx[0] = index;
@@ -125,3 +126,5 @@ out_busy:
 }
 
 module_init(h8300_ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 01b92208f09d..e77cee0e5d65 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -658,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive)
                 local_irq_restore(flags);
                 return 0;
         }
-        ata_input_data(drive, id, SECTOR_WORDS);
+        hwif->ata_input_data(drive, id, SECTOR_WORDS);
         (void)ide_read_status(drive);   /* clear drive IRQ */
         local_irq_enable();
         local_irq_restore(flags);
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index b163b2e52212..c14bb5380c25 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)
 
 module_init(pnpide_init);
 module_exit(pnpide_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 50ffa871d5e9..fdd3791e465f 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -241,3 +241,5 @@ fail_base2:
 }
 
 module_init(buddha_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 8949ce71bddc..e950afa5939c 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -93,3 +93,5 @@ static int __init falconide_init(void)
 }
 
 module_init(falconide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index b7d81090d5da..e3b4638cc883 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -195,3 +195,5 @@ found:
 }
 
 module_init(gayle_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 9a79098d9eb4..eaf5dbe58bc2 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -137,3 +137,5 @@ static int __init macide_init(void)
 }
 
 module_init(macide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 1381b91bc316..2da28759686e 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -153,3 +153,5 @@ static int __init q40ide_init(void)
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index ec667982809c..29fbc5ead03b 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -881,3 +881,5 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0);
 MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");
 
 module_init(cmd640x_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 38fbfb8d5445..ebaba01c7551 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
 }
 
 module_init(mpc8xx_ide_probe);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 78c9eeb85634..d9ca52e6cdab 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1771,3 +1771,5 @@ static int __devinit pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 54c662690f65..853bce0ac478 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4329,10 +4329,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!hw)
                 return 0;
 
+        del_timer_sync(&hw->watchdog_timer);
+        cancel_work_sync(&hw->restart_work);
+
         for (i = 0; i < hw->ports; i++) {
                 struct net_device *dev = hw->dev[i];
                 struct sky2_port *sky2 = netdev_priv(dev);
 
+                netif_device_detach(dev);
                 if (netif_running(dev))
                         sky2_down(dev);
 
@@ -4383,6 +4387,8 @@ static int sky2_resume(struct pci_dev *pdev)
 
         for (i = 0; i < hw->ports; i++) {
                 struct net_device *dev = hw->dev[i];
+
+                netif_device_attach(dev);
                 if (netif_running(dev)) {
                         err = sky2_up(dev);
                         if (err) {
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index d57bf3e708d8..430997e33fc4 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -96,6 +96,7 @@
 
  /* PDC registers */
 #define UART_PUT_PTCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
+#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 #define UART_GET_PTSR(port)     __raw_readl((port)->membase + ATMEL_PDC_PTSR)
 
 #define UART_PUT_RPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
@@ -106,6 +107,7 @@
 
 #define UART_PUT_TPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TPR)
 #define UART_PUT_TCR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TCR)
+#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 
 static int (*atmel_open_hook)(struct uart_port *);
 static void (*atmel_close_hook)(struct uart_port *);
@@ -562,17 +564,22 @@ static void atmel_tx_dma(struct uart_port *port)
         struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
         int count;
 
+        /* nothing left to transmit? */
+        if (UART_GET_TCR(port))
+                return;
+
         xmit->tail += pdc->ofs;
         xmit->tail &= UART_XMIT_SIZE - 1;
 
         port->icount.tx += pdc->ofs;
         pdc->ofs = 0;
 
-        if (!uart_circ_empty(xmit)) {
-                /* more to transmit - setup next transfer */
+        /* more to transmit - setup next transfer */
 
-                /* disable PDC transmit */
-                UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+        /* disable PDC transmit */
+        UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+
+        if (!uart_circ_empty(xmit)) {
                 dma_sync_single_for_device(port->dev,
                                            pdc->dma_addr,
                                            pdc->dma_size,
@@ -586,11 +593,6 @@ static void atmel_tx_dma(struct uart_port *port)
                 /* re-enable PDC transmit and interrupts */
                 UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);
                 UART_PUT_IER(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
-        } else {
-                /* nothing left to transmit - disable the transmitter */
-
-                /* disable PDC transmit */
-                UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
         }
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -1274,6 +1276,7 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
 {
         struct uart_port *port = &atmel_ports[co->index].uart;
         unsigned int status, imr;
+        unsigned int pdc_tx;
 
         /*
          * First, save IMR and then disable interrupts
@@ -1281,6 +1284,10 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
         imr = UART_GET_IMR(port);
         UART_PUT_IDR(port, ATMEL_US_RXRDY | ATMEL_US_TXRDY);
 
+        /* Store PDC transmit status and disable it */
+        pdc_tx = UART_GET_PTSR(port) & ATMEL_PDC_TXTEN;
+        UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+
         uart_console_write(port, s, count, atmel_console_putchar);
 
         /*
@@ -1290,6 +1297,11 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
         do {
                 status = UART_GET_CSR(port);
         } while (!(status & ATMEL_US_TXRDY));
+
+        /* Restore PDC transmit status */
+        if (pdc_tx)
+                UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);
+
         /* set interrupts back the way they were */
         UART_PUT_IER(port, imr);
 }