diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:28 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:28 +0200 |
commit | 19b1a15a3de2b3b6367c968e65bffe9503556ef1 (patch) | |
tree | bd87869290924ac3fee2126e5ba3aa668dde5d09 /sound/core/pcm_lib.c | |
parent | e618a5609e504845786c71e2825e10b6a9728185 (diff) | |
parent | 3f7440a6b771169e1f11fa582e53a4259b682809 (diff) |
Merge branch 'topic/div64-cleanup' into for-linus
* topic/div64-cleanup:
ALSA: Clean up 64bit division functions
Diffstat (limited to 'sound/core/pcm_lib.c')
-rw-r--r-- | sound/core/pcm_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index d659995ac3a..a7482874c45 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -22,6 +22,7 @@ #include <linux/slab.h> #include <linux/time.h> +#include <linux/math64.h> #include <sound/core.h> #include <sound/control.h> #include <sound/info.h> @@ -452,7 +453,7 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b, *r = 0; return UINT_MAX; } - div64_32(&n, c, r); + n = div_u64_rem(n, c, r); if (n >= UINT_MAX) { *r = 0; return UINT_MAX; |