Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver merge from Greg Kroah-Hartman:
 "Here is the "big" char/misc driver tree update for the 3.7-rc1 merge
  window.

  Nothing major, just a number of driver updates and fixes, all of which
  have been in the linux-next releases for a while now either in my
  tree, or in Andrew's (the lis3l driver changes came from his tree last
  week).

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

* tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits)
  drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init
  drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init
  drivers/misc/lis3lv02d: remove lis3lv02d driver DT init
  drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code
  drivers/misc/lis3lv02d: add generic DT matching code
  lis3lv02d: fix some comments specific to lis331dlh driver
  MISC: hpilo, remove pci_disable_device
  pcmcia: synclink_cs: fix potential tty NULL dereference
  drivers/char/mmtimer.c: Remove useless kfree
  drivers/char: removes unnecessary semicolon
  char/misc: remove CONFIG_EXPERIMENTAL dependencies
  mei: don't print buffer as a string
  mei: struct mei_message_data doesn't have to be packed
  mei: add error messages for open count errors
  misc: use module_spi_driver
  tifm: use module_pci_driver
  misc/at25, dt: Improve at25 SPI eeprom device tree bindings.
  mei: add lynx point pci device ids
  mei: fix max number of open handles
  mei: rename struct pci_dev *mei_device to mei_pdev
  ...

8 files changed, 36 insertions, 18 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ea6f6325f9b..72bedad6bf8 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -418,8 +418,8 @@ config APPLICOM
           If unsure, say N.
 
 config SONYPI
-        tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT
+        tristate "Sony Vaio Programmable I/O Control Device support"
+        depends on X86 && PCI && INPUT && !64BIT
         ---help---
           This driver enables access to the Sony Programmable I/O Control
           Device which can be found in many (all ?) Sony Vaio laptops.
@@ -566,7 +566,7 @@ source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
         tristate "Telecom clock driver for ATCA SBC"
-        depends on EXPERIMENTAL && X86
+        depends on X86
         default n
         help
           The telecom clock device is specific to the MPCBL0010 and MPCBL0050
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index 33dc2298af7..3d6c0671e99 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -826,7 +826,7 @@ static int __init mmtimer_init(void)
 
         /* Allocate list of node ptrs to mmtimer_t's */
         timers = kzalloc(sizeof(struct mmtimer_node)*maxn, GFP_KERNEL);
-        if (timers == NULL) {
+        if (!timers) {
                 printk(KERN_ERR "%s: failed to allocate memory for device\n",
                                 MMTIMER_NAME);
                 goto out3;
@@ -848,7 +848,6 @@ static int __init mmtimer_init(void)
         return 0;
 
 out3:
-        kfree(timers);
         misc_deregister(&mmtimer_miscdev);
 out2:
         free_irq(SGI_MMTIMER_VECTOR, NULL);
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 04a480f86c6..cfdfe493c6a 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -93,9 +93,9 @@ int button_del_callback (void (*callback) (void))
                         button_callback_list [lp].count = 0;
                         callback_count--;
                         return 0;
-                };
+                }
                 lp--;
-        };
+        }
         return -EINVAL;
 }
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 0a484b4a1b0..a6b8ddea222 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -891,6 +891,14 @@ static void rx_ready_async(MGSLPC_INFO *info, int tcd, struct tty_struct *tty)
         int work = 0;
         struct mgsl_icount *icount = &info->icount;
 
+        if (!tty) {
+                /* tty is not available anymore */
+                issue_command(info, CHA, CMD_RXRESET);
+                if (debug_level >= DEBUG_LEVEL_ISR)
+                        printk("%s(%d):rx_ready_async(tty=NULL)\n",__FILE__,__LINE__);
+                return;
+        }
+
         if (tcd) {
                 /* early termination, get FIFO count from RBCL register */
                 fifo_count = (unsigned char)(read_reg(info, CHA+RBCL) & 0x1f);
@@ -980,7 +988,7 @@ static void tx_done(MGSLPC_INFO *info, struct tty_struct *tty)
         else
 #endif
         {
-                if (tty->stopped || tty->hw_stopped) {
+                if (tty && (tty->stopped || tty->hw_stopped)) {
                         tx_stop(info);
                         return;
                 }
@@ -1000,7 +1008,7 @@ static void tx_ready(MGSLPC_INFO *info, struct tty_struct *tty)
                 if (!info->tx_active)
                         return;
         } else {
-                if (tty->stopped || tty->hw_stopped) {
+                if (tty && (tty->stopped || tty->hw_stopped)) {
                         tx_stop(info);
                         return;
                 }
@@ -1050,13 +1058,12 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
         wake_up_interruptible(&info->status_event_wait_q);
         wake_up_interruptible(&info->event_wait_q);
 
-        if (info->port.flags & ASYNC_CTS_FLOW) {
+        if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
                 if (tty->hw_stopped) {
                         if (info->serial_signals & SerialSignal_CTS) {
                                 if (debug_level >= DEBUG_LEVEL_ISR)
                                         printk("CTS tx start...");
-                                if (tty)
-                                        tty->hw_stopped = 0;
+                                tty->hw_stopped = 0;
                                 tx_start(info, tty);
                                 info->pending_bh |= BH_TRANSMIT;
                                 return;
@@ -1065,8 +1072,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
                         if (!(info->serial_signals & SerialSignal_CTS)) {
                                 if (debug_level >= DEBUG_LEVEL_ISR)
                                         printk("CTS tx stop...");
-                                if (tty)
-                                        tty->hw_stopped = 1;
+                                tty->hw_stopped = 1;
                                 tx_stop(info);
                         }
                 }
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 3fcf80ff12f..d0d824ebf2c 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -783,7 +783,8 @@ static int __init ppdev_init (void)
                 err = PTR_ERR(ppdev_class);
                 goto out_chrdev;
         }
-        if (parport_register_driver(&pp_driver)) {
+        err = parport_register_driver(&pp_driver);
+        if (err < 0) {
                 printk (KERN_WARNING CHRDEV ": unable to register with parport\n");
                 goto out_class;
         }
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index af9437488b6..91470fdbab2 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -411,7 +411,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
                 case RTC_IRQP_READ:
                 case RTC_IRQP_SET:
                         return -EINVAL;
-                };
+                }
         }
 #endif
 
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index ce29e7cce52..e95e0ab0bd8 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -784,8 +784,10 @@ static int __init tlclk_init(void)
         }
         tlclk_major = ret;
         alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL);
-        if (!alarm_events)
+        if (!alarm_events) {
+                ret = -ENOMEM;
                 goto out1;
+        }
 
         /* Read telecom clock IRQ number (Set by BIOS) */
         if (!request_region(TLCLK_BASE, 8, "telco_clock")) {
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index cdf2f5451c7..060a672ebb7 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1941,7 +1941,17 @@ static int __init init(void)
         INIT_LIST_HEAD(&pdrvdata.consoles);
         INIT_LIST_HEAD(&pdrvdata.portdevs);
 
-        return register_virtio_driver(&virtio_console);
+        err = register_virtio_driver(&virtio_console);
+        if (err < 0) {
+                pr_err("Error %d registering virtio driver\n", err);
+                goto free;
+        }
+        return 0;
+free:
+        if (pdrvdata.debugfs_dir)
+                debugfs_remove_recursive(pdrvdata.debugfs_dir);
+        class_destroy(pdrvdata.class);
+        return err;
 }
 
 static void __exit fini(void)