remove redundant test required by non-sense follow control
introduced by previous commit
fix a copy-and-past bug
Merge subtree 'usb-wlan' (commit '9c3730dc')