summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-31 10:17:44 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-31 10:17:44 +0200
commitd62e345f142ba271d9dab2b2e6cb5070cae94754 (patch)
treee404f3351325a1e91eff444115999eda88b7b58e /sound
parent6280b61af50ef3086816a9e753af355690fa78db (diff)
parentf065fabc864f4c98857bf67caa2365e9f8545751 (diff)
downloadop-kernel-dev-d62e345f142ba271d9dab2b2e6cb5070cae94754.zip
op-kernel-dev-d62e345f142ba271d9dab2b2e6cb5070cae94754.tar.gz
Merge branch 'fix/misc' into for-linus
* fix/misc: ALSA: sound/aoa: Add kmalloc NULL tests
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/core/gpio-pmf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 5ca2220..1dd0c28 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;
OpenPOWER on IntegriCloud