diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /lib/lzo/lzo1x_decompress.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'lib/lzo/lzo1x_decompress.c')
| -rw-r--r-- | lib/lzo/lzo1x_decompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c index 9dc7056e5520..77f0f9b775a9 100644 --- a/lib/lzo/lzo1x_decompress.c +++ b/lib/lzo/lzo1x_decompress.c | |||
| @@ -158,7 +158,7 @@ match: | |||
| 158 | t += 7 + *ip++; | 158 | t += 7 + *ip++; |
| 159 | } | 159 | } |
| 160 | m_pos -= le16_to_cpu(get_unaligned( | 160 | m_pos -= le16_to_cpu(get_unaligned( |
| 161 | (const unsigned short *)ip) >> 2); | 161 | (const unsigned short *)ip)) >> 2; |
| 162 | ip += 2; | 162 | ip += 2; |
| 163 | if (m_pos == op) | 163 | if (m_pos == op) |
| 164 | goto eof_found; | 164 | goto eof_found; |