diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-17 23:56:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-17 23:56:30 -0700 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /lib | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
| download | op-kernel-dev-1e42198609d73ed1a9adcba2af275c24c2678420.zip op-kernel-dev-1e42198609d73ed1a9adcba2af275c24c2678420.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib')
| -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 9dc7056..77f0f9b 100644 --- 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; |
