Commit 48ab3578 authored Jul 12, 2009 by Alan Jenkins Committed by John W. Linville Jul 21, 2009

rfkill: fix rfkill_set_states() to set the hw state



The point of this function is to set the software and hardware state at
the same time.  When I tried to use it, I found it was only setting the
software state.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 8ef86c7b

net/rfkill/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -549,6 +549,10 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw, bool hw)
		swprev = !!(rfkill->state & RFKILL_BLOCK_SW);
		hwprev = !!(rfkill->state & RFKILL_BLOCK_HW);
		__rfkill_set_sw_state(rfkill, sw);
		if (hw)
		rfkill->state \|= RFKILL_BLOCK_HW;
		else
		rfkill->state &= ~RFKILL_BLOCK_HW;

		spin_unlock_irqrestore(&rfkill->lock, flags);

Admin message