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

[karo-tx-linux.git] / lib / 842 / 842_decompress.c

diff --git a/lib/842/842_decompress.c b/lib/842/842_decompress.c
index a2a941f8112ddb9bb32f00afa2c0f2299ccf1950..11fc39b4032b5aa0d4e1958ecb1cabdc43cdcb07 100644 (file)
--- a/lib/842/842_decompress.c
+++ b/lib/842/842_decompress.c
@@ -69,7 +69,7 @@ struct sw842_param {
        ((s) == 2 ? be16_to_cpu(get_unaligned((__be16 *)d)) :   \
         (s) == 4 ? be32_to_cpu(get_unaligned((__be32 *)d)) :   \
         (s) == 8 ? be64_to_cpu(get_unaligned((__be64 *)d)) :   \
-        WARN(1, "pr_debug param err invalid size %x\n", s))
+        0)
 
 static int next_bits(struct sw842_param *p, u64 *d, u8 n);
 
@@ -202,10 +202,14 @@ static int __do_index(struct sw842_param *p, u8 size, u8 bits, u64 fsize)
                return -EINVAL;
        }
 
-       pr_debug("index%x to %lx off %lx adjoff %lx tot %lx data %lx\n",
-                size, (unsigned long)index, (unsigned long)(index * size),
-                (unsigned long)offset, (unsigned long)total,
-                (unsigned long)beN_to_cpu(&p->ostart[offset], size));
+       if (size != 2 && size != 4 && size != 8)
+               WARN(1, "__do_index invalid size %x\n", size);
+       else
+               pr_debug("index%x to %lx off %lx adjoff %lx tot %lx data %lx\n",
+                        size, (unsigned long)index,
+                        (unsigned long)(index * size), (unsigned long)offset,
+                        (unsigned long)total,
+                        (unsigned long)beN_to_cpu(&p->ostart[offset], size));
 
        memcpy(p->out, &p->ostart[offset], size);
        p->out += size;