Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / lib / lzo / lzo1x_decompress.c

diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 9dc7056e5520ff8a461cdea46258d1333de1b726..77f0f9b775a9c12ab2c1b42aaac31a0cf883e1d7 100644 (file)
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -158,7 +158,7 @@ match:
                                        t += 7 + *ip++;
                                }
                                m_pos -= le16_to_cpu(get_unaligned(
-                                       (const unsigned short *)ip) >> 2);
+                                       (const unsigned short *)ip)) >> 2;
                                ip += 2;
                                if (m_pos == op)
                                        goto eof_found;