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/oss/pcm_oss.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/core/oss/pcm_oss.c')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 80423a4ccab6..58550cc93f28 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
| @@ -854,7 +854,6 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream) | |||
| 854 | params = kmalloc(sizeof(*params), GFP_KERNEL); | 854 | params = kmalloc(sizeof(*params), GFP_KERNEL); |
| 855 | sparams = kmalloc(sizeof(*sparams), GFP_KERNEL); | 855 | sparams = kmalloc(sizeof(*sparams), GFP_KERNEL); |
| 856 | if (!sw_params || !params || !sparams) { | 856 | if (!sw_params || !params || !sparams) { |
| 857 | pcm_dbg(substream->pcm, "No memory\n"); | ||
| 858 | err = -ENOMEM; | 857 | err = -ENOMEM; |
| 859 | goto failure; | 858 | goto failure; |
| 860 | } | 859 | } |