Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	arch/microblaze/include/asm/socket.h

1 files changed, 4 insertions, 0 deletions

diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 5ca2220eac7d..1dd0c28d1fb7 100644
--- 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;