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/seq/oss/seq_oss_midi.c | |
parent | ALSA: usb-audio: Don't attempt to get Microsoft Lifecam Cinema sample rate (diff) | |
parent | ALSA: control: Fix a typo of SNDRV_CTL_ELEM_ACCESS_TLV_* with SNDRV_CTL_TLV_OP_* (diff) | |
download | linux-dev-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.tar.xz linux-dev-9a4f35865ffcb2f4603375eadabe0d475fab1a0f.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/seq/oss/seq_oss_midi.c')
-rw-r--r-- | sound/core/seq/oss/seq_oss_midi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c index e79cc44b1394..96e8395ae586 100644 --- a/sound/core/seq/oss/seq_oss_midi.c +++ b/sound/core/seq/oss/seq_oss_midi.c @@ -173,10 +173,9 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo) /* * allocate midi info record */ - if ((mdev = kzalloc(sizeof(*mdev), GFP_KERNEL)) == NULL) { - pr_err("ALSA: seq_oss: can't malloc midi info\n"); + mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); + if (!mdev) return -ENOMEM; - } /* copy the port information */ mdev->client = pinfo->addr.client; |