diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-01-09 08:49:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-01-09 08:49:53 +0100 |
| commit | 9dd55cb419769f8cb363d764815f119b98a816fa (patch) | |
| tree | b423f3d594a2ac7d84b840b4ea11e24e86880155 /sound/core/pcm_lib.c | |
| parent | da911b1f5e98f21b20aa042748dfe73e36322fb1 (diff) | |
| parent | 900498a34a3ac9c611e9b425094c8106bdd7dc1c (diff) | |
Merge branch 'for-linus' into for-next
Back-merge to continue fixing the OSS emulation code.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_lib.c')
| -rw-r--r-- | sound/core/pcm_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index bfff8d001466..32e33e75f3cb 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1632,7 +1632,7 @@ int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm, return changed; if (params->rmask) { int err = snd_pcm_hw_refine(pcm, params); - if (snd_BUG_ON(err < 0)) + if (err < 0) return err; } return snd_pcm_hw_param_value(params, var, dir); @@ -1678,7 +1678,7 @@ int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm, return changed; if (params->rmask) { int err = snd_pcm_hw_refine(pcm, params); - if (snd_BUG_ON(err < 0)) + if (err < 0) return err; } return snd_pcm_hw_param_value(params, var, dir); |