From a9fbd0f8372b8c8d2a09acfcb9cfd05f69a0f71e Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Tue, 8 Jan 2013 12:52:35 -0500 Subject: [PATCH] --- yaml --- r: 353995 b: refs/heads/master c: 40a0136b5a7113ccf8d17e56c1f25f63427c4022 h: refs/heads/master i: 353993: 34917f86dd6f17b3d7b9fcf8bf3d22446788b691 353991: ec13f388df8d7c8af322f2ae2abf87640e6de7e8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/channel.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b035f4cecba7..3a3b77f15d3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1b46e75fb307132ebbfdd65055bf622cc3f646e +refs/heads/master: 40a0136b5a7113ccf8d17e56c1f25f63427c4022 diff --git a/trunk/drivers/staging/vt6655/channel.c b/trunk/drivers/staging/vt6655/channel.c index 47c156bb70a9..aa76e39a46f4 100644 --- a/trunk/drivers/staging/vt6655/channel.c +++ b/trunk/drivers/staging/vt6655/channel.c @@ -749,9 +749,9 @@ bool get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, unsigned char *pbyChannelNumber, unsigned char *pbyMap) { - if (uChannelIndex > CB_MAX_CHANNEL) { + if (uChannelIndex > CB_MAX_CHANNEL) return false; - } + *pbyChannelNumber = sChannelTbl[uChannelIndex].byChannelNumber; *pbyMap = sChannelTbl[uChannelIndex].byMAP; return sChannelTbl[uChannelIndex].bValid; @@ -761,9 +761,9 @@ void set_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, unsigned char byMap) { - if (uChannelIndex > CB_MAX_CHANNEL) { + if (uChannelIndex > CB_MAX_CHANNEL) return; - } + sChannelTbl[uChannelIndex].byMAP |= byMap; } @@ -771,9 +771,8 @@ void clear_channel_map_info(void *pDeviceHandler) { unsigned int ii = 0; - for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) { + for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) sChannelTbl[ii].byMAP = 0; - } } unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType)