diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-01-15 16:45:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-01-15 16:45:15 +0100 |
| commit | 4ea5553a51e55664f86bed29e62e67ecb45bedd8 (patch) | |
| tree | ea63c963555b083858c581385ff5bfb24413caca /sound/core/pcm_lib.c | |
| parent | 33193dca671c8b75eb030234cefdcd2ceebd7516 (diff) | |
| parent | b3defb791b26ea0683a93a4f49c77ec45ec96f10 (diff) | |
| download | linux-4ea5553a51e55664f86bed29e62e67ecb45bedd8.tar.bz2 | |
Merge branch 'for-linus' into for-next
Back-merge to the development branch for further fixes of sequencer
stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_lib.c')
| -rw-r--r-- | sound/core/pcm_lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 32e33e75f3cb..a83152e7d387 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -560,7 +560,6 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b, { u_int64_t n = (u_int64_t) a * b; if (c == 0) { - snd_BUG_ON(!n); *r = 0; return UINT_MAX; } |