3 files changed, 35 insertions, 20 deletions

diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 5fec1e58f310..5f38f670102c 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -215,15 +215,18 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
 {
         struct pmac_beep *beep;
         struct input_dev *input_dev;
+        struct snd_kcontrol *beep_ctl;
         void *dmabuf;
         int err = -ENOMEM;
 
         beep = kzalloc(sizeof(*beep), GFP_KERNEL);
+        if (! beep)
+                return -ENOMEM;
         dmabuf = dma_alloc_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4,
                                     &beep->addr, GFP_KERNEL);
         input_dev = input_allocate_device();
-        if (!beep || !dmabuf || !input_dev)
-                goto fail;
+        if (! dmabuf || ! input_dev)
+                goto fail1;
 
         /* FIXME: set more better values */
         input_dev->name = "PowerMac Beep";
@@ -244,17 +247,24 @@ int __init snd_pmac_attach_beep(struct snd_pmac *chip)
         beep->volume = BEEP_VOLUME;
         beep->running = 0;
 
-        err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_pmac_beep_mixer, chip));
+        beep_ctl = snd_ctl_new1(&snd_pmac_beep_mixer, chip);
+        err = snd_ctl_add(chip->card, beep_ctl);
         if (err < 0)
-                goto fail;
+                goto fail1;
+ 
+        chip->beep = beep;
 
-        chip->beep = beep;
-        input_register_device(beep->dev);
-
-        return 0;
-
- fail:  input_free_device(input_dev);
-        kfree(dmabuf);
+        err = input_register_device(beep->dev);
+        if (err)
+                goto fail2;
+ 
+        return 0;
+ 
+ fail2: snd_ctl_remove(chip->card, beep_ctl);
+ fail1: input_free_device(input_dev);
+        if (dmabuf)
+                dma_free_coherent(&chip->pdev->dev, BEEP_BUFLEN * 4,
+                                  dmabuf, beep->addr);
         kfree(beep);
         return err;
 }
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 59482a4cd446..272ae38e9b18 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -117,6 +117,9 @@ int __init snd_pmac_tumbler_post_init(void)
 {
         int err;
         
+        if (!keywest_ctx || !keywest_ctx->client)
+                return -ENXIO;
+
         if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) {
                 snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
                 return err;
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 84f6b19c07ca..cdff53e4a17e 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -190,7 +190,7 @@ static int check_audio_gpio(struct pmac_gpio *gp)
 
         ret = do_gpio_read(gp);
 
-        return (ret & 0xd) == (gp->active_val & 0xd);
+        return (ret & 0x1) == (gp->active_val & 0x1);
 }
 
 static int read_audio_gpio(struct pmac_gpio *gp)
@@ -198,7 +198,8 @@ static int read_audio_gpio(struct pmac_gpio *gp)
         int ret;
         if (! gp->addr)
                 return 0;
-        ret = ((do_gpio_read(gp) & 0x02) !=0);
+        ret = do_gpio_read(gp);
+        ret = (ret & 0x02) !=0;
         return ret == gp->active_state;
 }
 
@@ -1035,7 +1036,7 @@ static struct device_node *find_audio_device(const char *name)
                 return NULL;
   
         for (np = np->child; np; np = np->sibling) {
-                char *property = get_property(np, "audio-gpio", NULL);
+                const char *property = get_property(np, "audio-gpio", NULL);
                 if (property && strcmp(property, name) == 0)
                         return np;
         }  
@@ -1062,7 +1063,8 @@ static long tumbler_find_device(const char *device, const char *platform,
                                 struct pmac_gpio *gp, int is_compatible)
 {
         struct device_node *node;
-        u32 *base, addr;
+        const u32 *base;
+        u32 addr;
 
         if (is_compatible)
                 node = find_compatible_audio_device(device);
@@ -1074,9 +1076,9 @@ static long tumbler_find_device(const char *device, const char *platform,
                 return -ENODEV;
         }
 
-        base = (u32 *)get_property(node, "AAPL,address", NULL);
+        base = get_property(node, "AAPL,address", NULL);
         if (! base) {
-                base = (u32 *)get_property(node, "reg", NULL);
+                base = get_property(node, "reg", NULL);
                 if (!base) {
                         DBG("(E) cannot find address for device %s !\n", device);
                         snd_printd("cannot find address for device %s\n", device);
@@ -1090,13 +1092,13 @@ static long tumbler_find_device(const char *device, const char *platform,
 
         gp->addr = addr & 0x0000ffff;
         /* Try to find the active state, default to 0 ! */
-        base = (u32 *)get_property(node, "audio-gpio-active-state", NULL);
+        base = get_property(node, "audio-gpio-active-state", NULL);
         if (base) {
                 gp->active_state = *base;
                 gp->active_val = (*base) ? 0x5 : 0x4;
                 gp->inactive_val = (*base) ? 0x4 : 0x5;
         } else {
-                u32 *prop = NULL;
+                const u32 *prop = NULL;
                 gp->active_state = 0;
                 gp->active_val = 0x4;
                 gp->inactive_val = 0x5;
@@ -1105,7 +1107,7 @@ static long tumbler_find_device(const char *device, const char *platform,
                  * as we don't yet have an interpreter for these things
                  */
                 if (platform)
-                        prop = (u32 *)get_property(node, platform, NULL);
+                        prop = get_property(node, platform, NULL);
                 if (prop) {
                         if (prop[3] == 0x9 && prop[4] == 0x9) {
                                 gp->active_val = 0xd;