Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: fixes for 3.4

A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 1ccedb71e728..168d8008f460 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -211,18 +211,17 @@ static void __exit ibmasm_exit (void)
 
 static int __init ibmasm_init(void)
 {
-        int result;
+        int result = pci_register_driver(&ibmasm_driver);
+        if (result)
+                return result;
 
         result = ibmasmfs_register();
         if (result) {
+                pci_unregister_driver(&ibmasm_driver);
                 err("Failed to register ibmasmfs file system");
                 return result;
         }
-        result = pci_register_driver(&ibmasm_driver);
-        if (result) {
-                ibmasmfs_unregister();
-                return result;
-        }
+
         ibmasm_register_panic_notifier();
         info(DRIVER_DESC " version " DRIVER_VERSION " loaded");
         return 0;