1 files changed, 6 insertions, 7 deletions

diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 172eb95476c0..1b94ba6dd279 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -1014,7 +1014,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
 
         ldev->gpio.methods->init(&ldev->gpio);
 
-        err = aoa_fabric_register(&layout_fabric);
+        err = aoa_fabric_register(&layout_fabric, &sdev->ofdev.dev);
         if (err && err != -EALREADY) {
                 printk(KERN_INFO "snd-aoa-fabric-layout: can't use,"
                                  " another fabric is active!\n");
@@ -1034,9 +1034,9 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
         list_del(&ldev->list);
         layouts_list_items--;
  outnodev:
-        if (sound) of_node_put(sound);
+        of_node_put(sound);
         layout_device = NULL;
-        if (ldev) kfree(ldev);
+        kfree(ldev);
         return -ENODEV;
 }
 
@@ -1077,8 +1077,6 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta
 {
         struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
 
-        printk("aoa_fabric_layout_suspend()\n");
-
         if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
                 ldev->gpio.methods->all_amps_off(&ldev->gpio);
 
@@ -1089,8 +1087,6 @@ static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)
 {
         struct layout_dev *ldev = sdev->ofdev.dev.driver_data;
 
-        printk("aoa_fabric_layout_resume()\n");
-
         if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
                 ldev->gpio.methods->all_amps_restore(&ldev->gpio);
 
@@ -1107,6 +1103,9 @@ static struct soundbus_driver aoa_soundbus_driver = {
         .suspend = aoa_fabric_layout_suspend,
         .resume = aoa_fabric_layout_resume,
 #endif
+        .driver = {
+                .owner = THIS_MODULE,
+        }
 };
 
 static int __init aoa_fabric_layout_init(void)