Re: [PATCH] Fix logic error in rfkill_check_duplicity

From: Henrique de Moraes Holschuh
Date: Thu Oct 30 2008 - 16:49:26 EST


On Thu, 30 Oct 2008, Jonathan McDowell wrote:
> On Thu, Oct 30, 2008 at 10:27:46AM +0000, Jonathan McDowell wrote:
> > I'll have a prod at why the [hso] rfkill stuff isn't working next
>
> Ok, I believe this is due to the addition of rfkill_check_duplicity in
> rfkill and the fact that test_bit actually returns a negative value
> rather than the postive one expected (which is of course equally true).
> So when the second WLAN device (the hso device, with the EEE PC WLAN
> being the first) comes along rfkill_check_duplicity returns a negative
> value and so rfkill_register returns an error. Patch below fixes this
> for me.

Good catch, I screwed up on that one. Please forward it with my ack to
linux-wireless@xxxxxxxxxx and to Ivo van Doorn <IvDoorn@xxxxxxxxx> and John
W. Linville <linville@xxxxxxxxxxxxx>.

Acked-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>

> -----
> diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
> index f949a48..1ba35a7 100644
> --- a/net/rfkill/rfkill.c
> +++ b/net/rfkill/rfkill.c
> @@ -603,7 +603,7 @@ static int rfkill_check_duplicity(const struct rfkill *rfkil
> }
>
> /* 0: first switch of its kind */
> - return test_bit(rfkill->type, seen);
> + return (test_bit(rfkill->type, seen)) ? 1 : 0;
> }
>
> static int rfkill_add_switch(struct rfkill *rfkill)
> -----
>
> J.
>

--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/