diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
| commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
| tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /sound/core/hwdep.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/hwdep.c')
| -rw-r--r-- | sound/core/hwdep.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 84244a5143cf..51692c8a39ea 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c | |||
| @@ -378,10 +378,8 @@ int snd_hwdep_new(struct snd_card *card, char *id, int device, | |||
| 378 | if (rhwdep) | 378 | if (rhwdep) |
| 379 | *rhwdep = NULL; | 379 | *rhwdep = NULL; |
| 380 | hwdep = kzalloc(sizeof(*hwdep), GFP_KERNEL); | 380 | hwdep = kzalloc(sizeof(*hwdep), GFP_KERNEL); |
| 381 | if (hwdep == NULL) { | 381 | if (!hwdep) |
| 382 | dev_err(card->dev, "hwdep: cannot allocate\n"); | ||
| 383 | return -ENOMEM; | 382 | return -ENOMEM; |
| 384 | } | ||
| 385 | 383 | ||
| 386 | init_waitqueue_head(&hwdep->open_wait); | 384 | init_waitqueue_head(&hwdep->open_wait); |
| 387 | mutex_init(&hwdep->open_mutex); | 385 | mutex_init(&hwdep->open_mutex); |