From 7c840713274eec61e519f9477ce67302f8f0858c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 9 Sep 2011 19:04:45 +0800 Subject: [PATCH] --- yaml --- r: 270419 b: refs/heads/master c: 5758960353d179f0541226764a1e47eff01666ff h: refs/heads/master i: 270417: 53e521d2157f7b7e469d4b059b0a7de3bc40bfa3 270415: 02240dedd92439364cc44cc46a3e263898db331d v: v3 --- [refs] | 2 +- trunk/sound/aoa/codecs/onyx.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 12ad68e6053e..c1f35b66147a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89f3325a6e3002f33bc5e0412d35fc097e219dbd +refs/heads/master: 5758960353d179f0541226764a1e47eff01666ff diff --git a/trunk/sound/aoa/codecs/onyx.c b/trunk/sound/aoa/codecs/onyx.c index 3687a6cc9881..762af68c8996 100644 --- a/trunk/sound/aoa/codecs/onyx.c +++ b/trunk/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; }