]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:44 +0000 (10:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:44 +0000 (10:17 +0200)
* fix/misc:
  ALSA: sound/aoa: Add kmalloc NULL tests

sound/aoa/core/gpio-pmf.c

index 5ca2220eac7d648a598488aca8858ef45f1e6afd..1dd0c28d1fb72c6bfb85858afc1f665917b94f86 100644 (file)
@@ -182,6 +182,10 @@ static int pmf_set_notify(struct gpio_runtime *rt,
        if (!old && notify) {
                irq_client = kzalloc(sizeof(struct pmf_irq_client),
                                     GFP_KERNEL);
+               if (!irq_client) {
+                       err = -ENOMEM;
+                       goto out_unlock;
+               }
                irq_client->data = notif;
                irq_client->handler = pmf_handle_notify_irq;
                irq_client->owner = THIS_MODULE;