aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-11-13 14:55:35 -0500
committerJiri Kosina <jkosina@suse.cz>2011-11-13 14:55:53 -0500
commit2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch)
treee075e4d5534193f28e6059904f61e5ca03958d3c /sound/aoa
parent4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff)
parent52e4c2a05256cb83cda12f3c2137ab1533344edb (diff)
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'sound/aoa')
-rw-r--r--sound/aoa/codecs/onyx.c4
-rw-r--r--sound/aoa/soundbus/i2sbus/pcm.c1
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,
1067 printk(KERN_DEBUG PFX "created and attached onyx instance\n"); 1067 printk(KERN_DEBUG PFX "created and attached onyx instance\n");
1068 return 0; 1068 return 0;
1069 fail: 1069 fail:
1070 i2c_set_clientdata(client, NULL);
1071 kfree(onyx); 1070 kfree(onyx);
1072 return -ENODEV; 1071 return -ENODEV;
1073} 1072}
@@ -1112,8 +1111,7 @@ static int onyx_i2c_remove(struct i2c_client *client)
1112 1111
1113 aoa_codec_unregister(&onyx->codec); 1112 aoa_codec_unregister(&onyx->codec);
1114 of_node_put(onyx->codec.node); 1113 of_node_put(onyx->codec.node);
1115 if (onyx->codec_info) 1114 kfree(onyx->codec_info);
1116 kfree(onyx->codec_info);
1117 kfree(onyx); 1115 kfree(onyx);
1118 return 0; 1116 return 0;
1119} 1117}
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 @@
12#include <sound/core.h> 12#include <sound/core.h>
13#include <asm/macio.h> 13#include <asm/macio.h>
14#include <linux/pci.h> 14#include <linux/pci.h>
15#include <linux/module.h>
15#include "../soundbus.h" 16#include "../soundbus.h"
16#include "i2sbus.h" 17#include "i2sbus.h"
17 18