Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/lcm.c b/lib/lcm.c
index b9c8de461e9e..51cc6b13cd52 100644
--- a/lib/lcm.c
+++ b/lib/lcm.c
@@ -7,10 +7,8 @@
 unsigned long lcm(unsigned long a, unsigned long b)
 {
         if (a && b)
-                return (a * b) / gcd(a, b);
-        else if (b)
-                return b;
-
-        return a;
+                return (a / gcd(a, b)) * b;
+        else
+                return 0;
 }
 EXPORT_SYMBOL_GPL(lcm);