summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-05-16 20:51:02 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-17 04:47:50 -0400
commit1f352920b908247273a7c1937fd8c341cc1cedb1 (patch)
tree67917c24bcb58bb5217cfc30e523ab7a546aae7d /drivers
parenta4ca44fa578c7c7fd123b7fba3c2c98d4ba4e53d (diff)
downloadlinux-3.10-1f352920b908247273a7c1937fd8c341cc1cedb1.tar.gz
linux-3.10-1f352920b908247273a7c1937fd8c341cc1cedb1.tar.bz2
linux-3.10-1f352920b908247273a7c1937fd8c341cc1cedb1.zip
isdn: remove duplicate NULL check
We test both "!skb_out" and "skb_out" here which is duplicative and causes a static checker warning. I considered that the intent might have been to test "skb_in" but that's a valid pointer here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/i4l/isdn_bsdcomp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index c59e8d2c067..8837ac5a492 100644
--- 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;