1. 08 4月, 2013 38 次提交
  2. 06 4月, 2013 2 次提交
    • J
      MFD: rtsx_pcr: Fix probe fail path · 9d66b568
      Jiri Slaby 提交于
      When rtsx_pci_acquire_irq fails in rtsx_pci_probe, we forget to
      disable an MSI (if we enabled it). This results in this warning on the
      next attempt to load the module:
      WARNING: at drivers/pci/msi.c:834 pci_enable_msi_block+0x2a4/0x2b0()
      Hardware name: HP EliteBook 840 G1
      Modules linked in: rtsx_pci(+) ...
      Pid: 4056, comm: modprobe Tainted: G          I  3.8.0-9405-gd895cb1a-1-vanilla #1
      Call Trace:
       [<ffffffff81045c6a>] warn_slowpath_common+0x7a/0xc0
       [<ffffffff81045cc5>] warn_slowpath_null+0x15/0x20
       [<ffffffff81302544>] pci_enable_msi_block+0x2a4/0x2b0
       [<ffffffffa05e335a>] rtsx_pci_probe+0x55a/0x720 [rtsx_pci]
      ...
      
      So properly disable MSI in that case.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      9d66b568
    • L
      mfd: abx500: Move the AB8500 Kconfig fragment · 58eb893d
      Linus Walleij 提交于
      Move the AB8500 Kconfig fragment below the AB3100 so the
      menuconfig menu gets hierarchically nested and looks nice.
      Having the EZX PCAP in the middle disturbs the nice
      hierarchical layout from kconfig.
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      58eb893d