1 files changed, 8 insertions, 9 deletions

diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 293dc748797c..dac6732da969 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -49,7 +49,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
         mutex_lock(&ac97_mutex);
 
         val = nuc900_checkready();
-        if (!!val) {
+        if (val) {
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
                 goto out;
         }
@@ -102,7 +102,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         mutex_lock(&ac97_mutex);
 
         tmp = nuc900_checkready();
-        if (!!tmp)
+        if (tmp)
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
 
         /* clear the R_WB bit and write register index */
@@ -149,7 +149,7 @@ static void nuc900_ac97_warm_reset(struct snd_ac97 *ac97)
         udelay(100);
 
         val = nuc900_checkready();
-        if (!!val)
+        if (val)
                 dev_err(nuc900_audio->dev, "AC97 codec is not ready\n");
 
         mutex_unlock(&ac97_mutex);
@@ -263,8 +263,7 @@ static int nuc900_ac97_trigger(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static int nuc900_ac97_probe(struct platform_device *pdev,
-                                        struct snd_soc_dai *dai)
+static int nuc900_ac97_probe(struct snd_soc_dai *dai)
 {
         struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
         unsigned long val;
@@ -284,12 +283,12 @@ static int nuc900_ac97_probe(struct platform_device *pdev,
         return 0;
 }
 
-static void nuc900_ac97_remove(struct platform_device *pdev,
-                                                struct snd_soc_dai *dai)
+static int nuc900_ac97_remove(struct snd_soc_dai *dai)
 {
         struct nuc900_audio *nuc900_audio = nuc900_ac97_data;
 
         clk_disable(nuc900_audio->clk);
+        return 0;
 }
 
 static struct snd_soc_dai_ops nuc900_ac97_dai_ops = {
@@ -313,7 +312,7 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
                 .channels_max   = 2,
         },
         .ops = &nuc900_ac97_dai_ops,
-}
+};
 
 static int __devinit nuc900_ac97_drvprobe(struct platform_device *pdev)
 {
@@ -384,7 +383,6 @@ out0:
 
 static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
 {
-
         snd_soc_unregister_dai(&pdev->dev);
 
         clk_put(nuc900_ac97_data->clk);
@@ -392,6 +390,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
         release_mem_region(nuc900_ac97_data->res->start,
                                 resource_size(nuc900_ac97_data->res));
 
+        kfree(nuc900_ac97_data);
         nuc900_ac97_data = NULL;
 
         return 0;