diff --git a/[refs] b/[refs] index 36142ea4d8d7..ad630825ffe0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 658ce9d653056a537df70e3a796654446fc9ff64 +refs/heads/master: 2e9ab1e72c631041f8a1c1d1fc7e5359e7e4a476 diff --git a/trunk/drivers/staging/rt3090/sta_ioctl.c b/trunk/drivers/staging/rt3090/sta_ioctl.c index 93efd7f5bf3f..b8ab84a0469b 100644 --- a/trunk/drivers/staging/rt3090/sta_ioctl.c +++ b/trunk/drivers/staging/rt3090/sta_ioctl.c @@ -1840,10 +1840,8 @@ int rt_ioctl_siwencode(struct net_device *dev, } else /* Don't complain if only change the mode */ - if(!erq->flags & IW_ENCODE_MODE) - { - return -EINVAL; - } + if (!(erq->flags & IW_ENCODE_MODE)) + return -EINVAL; } done: diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index e4fdb6fc6eab..96f2a78994be 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -1409,8 +1409,7 @@ int iwctl_siwencode(struct net_device *dev, // Do we want to just set the transmit key index ? if ( index < 4 ) { pDevice->byKeyIndex = index; - } - else if(!wrq->flags & IW_ENCODE_MODE) { + } else if (!(wrq->flags & IW_ENCODE_MODE)) { rc = -EINVAL; return rc; }