diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-13 10:23:18 +0200 |
| commit | 9a4f35865ffcb2f4603375eadabe0d475fab1a0f (patch) | |
| tree | 1465ac717deee029d3a9c1f7235ba85be57feefa /sound/core/hwdep.c | |
| parent | eef0342cf32689f77d78ee3302999e5caaa6a8f3 (diff) | |
| parent | c30cf8cbe55413cd643a0bdd3442d75950caa918 (diff) | |
Merge branch 'for-next' into for-linus
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, if (rhwdep) *rhwdep = NULL; hwdep = kzalloc(sizeof(*hwdep), GFP_KERNEL); - if (hwdep == NULL) { - dev_err(card->dev, "hwdep: cannot allocate\n"); + if (!hwdep) return -ENOMEM; - } init_waitqueue_head(&hwdep->open_wait); mutex_init(&hwdep->open_mutex); |