This is a bungle please disregard it. I will send it again with a 'ret' variable if that's okay (one that has been properly proofed and compiles). My apologies. Sorry for completely wasting your time by not checking properly. On 01/12/2015 08:30 AM, Malcolm Priestley wrote: > > > On 11/01/15 16:42, Joe Perches wrote: >> On Mon, 2015-01-12 at 03:19 +1100, Emrys Bayliss wrote: >>> This patch fixes the following checkpatch.pl error: >>> rxtx.c:588: WARNING: else is not generally useful after a break or return >>> >>> Signed-off-by: Emrys Bayliss <emrys@xxxxxxxxxxxxxxx> >>> --- >>> drivers/staging/vt6656/rxtx.c | 6 +----- >>> 1 file changed, 1 insertion(+), 5 deletions(-) >>> >>> diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c >>> index ea5140a..cc34704 100644 >>> --- a/drivers/staging/vt6656/rxtx.c >>> +++ b/drivers/staging/vt6656/rxtx.c >>> @@ -553,8 +553,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, >>> cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); >>> >>> memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN); >>> - >>> - return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head); >>> } else { >>> struct vnt_cts *buf = &head->cts_g; >>> /* Get SignalField,ServiceField,Length */ >>> @@ -571,11 +569,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, >>> cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS); >>> >>> memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN); >>> - >>> - return vnt_rxtx_datahead_g(tx_context, &buf->data_head); >>> } >>> >>> - return 0; >>> + return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head); >>> } >>> >>> static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, >> >> This is not the same code. >> Does this even compile? >> >> For the second block, you've changed >> return <foo>_g(...) to <foo>_g_fb(...). >> > Yes, this is wrong and will cause CTS to fail. > > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel