Merge branch 'fix/misc' into for-linus

* fix/misc: ALSA: sound/aoa: Add kmalloc NULL tests
mariux64 · Jul 31, 2009 · d62e345 · d62e345
2 parents 6280b61 + f065fab
commit d62e345
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
@@ -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;