Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / drivers / isdn / i4l / isdn_bsdcomp.c

diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index c59e8d2c067506b3dd7e39b45f36a2618f5574f2..8837ac5a492dd14eb79b392ba0d1d0907bd463dc 100644 (file)
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -612,7 +612,7 @@ static int bsd_compress(void *state, struct sk_buff *skb_in, struct sk_buff *skb
                db->n_bits++;
 
        /* If output length is too large then this is an incompressible frame. */
-       if (!skb_out || (skb_out && skb_out->len >= skb_in->len)) {
+       if (!skb_out || skb_out->len >= skb_in->len) {
                ++db->incomp_count;
                db->incomp_bytes += isize;
                return 0;