2 files changed, 2 insertions, 3 deletions

diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index 3687a6cc9881..762af68c8996 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -1067,7 +1067,6 @@ static int onyx_i2c_probe(struct i2c_client *client,
         printk(KERN_DEBUG PFX "created and attached onyx instance\n");
         return 0;
  fail:
-        i2c_set_clientdata(client, NULL);
         kfree(onyx);
         return -ENODEV;
 }
@@ -1112,8 +1111,7 @@ static int onyx_i2c_remove(struct i2c_client *client)
 
         aoa_codec_unregister(&onyx->codec);
         of_node_put(onyx->codec.node);
-        if (onyx->codec_info)
-                kfree(onyx->codec_info);
+        kfree(onyx->codec_info);
         kfree(onyx);
         return 0;
 }
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c
index be838993926d..19491ed9292f 100644
--- a/sound/aoa/soundbus/i2sbus/pcm.c
+++ b/sound/aoa/soundbus/i2sbus/pcm.c
@@ -12,6 +12,7 @@
 #include <sound/core.h>
 #include <asm/macio.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 #include "../soundbus.h"
 #include "i2sbus.h"