81873e9ccd
As reported by Modestas Vainius, enabling rkfill in 1 driver and disabling it in a second could cause a NULL pointer exception when the rfkill-disabled driver still sets the CONFIG_SUPPORT_HW_BUTTON flag. Furthermore, rfkill expects the timeout as a value in milliseconds instead of jiffies. Also increase the timeout to a second, since this 250ms would be overkill. Also the flag DEVICE_ENABLED_RADIO_HW is causing problems for devices which do not support the hardware button while rfkill is enabled in the driver. To remidy this we should inverse the flag and its meaning, rename the flag to DEVICE_DISABLED_RADIO_HW this means that by default the radio is enabled by the hardware button (if present) and can only be disabled explicitely. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
147 lines
3.9 KiB
C
147 lines
3.9 KiB
C
/*
|
|
Copyright (C) 2004 - 2007 rt2x00 SourceForge Project
|
|
<http://rt2x00.serialmonkey.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the
|
|
Free Software Foundation, Inc.,
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
Module: rt2x00rfkill
|
|
Abstract: rt2x00 rfkill routines.
|
|
*/
|
|
|
|
/*
|
|
* Set enviroment defines for rt2x00.h
|
|
*/
|
|
#define DRV_NAME "rt2x00lib"
|
|
|
|
#include <linux/input-polldev.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/rfkill.h>
|
|
|
|
#include "rt2x00.h"
|
|
#include "rt2x00lib.h"
|
|
|
|
static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state)
|
|
{
|
|
struct rt2x00_dev *rt2x00dev = data;
|
|
int retval = 0;
|
|
|
|
if (unlikely(!rt2x00dev))
|
|
return 0;
|
|
|
|
/*
|
|
* Only continue if there are enabled interfaces.
|
|
*/
|
|
if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
|
|
return 0;
|
|
|
|
if (state == RFKILL_STATE_ON) {
|
|
INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
|
|
__clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
|
|
retval = rt2x00lib_enable_radio(rt2x00dev);
|
|
} else if (state == RFKILL_STATE_OFF) {
|
|
INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
|
|
__set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
|
|
{
|
|
struct rt2x00_dev *rt2x00dev = poll_dev->private;
|
|
int state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
|
|
|
|
if (rt2x00dev->rfkill->state != state)
|
|
input_report_key(poll_dev->input, KEY_WLAN, 1);
|
|
}
|
|
|
|
int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
int retval;
|
|
|
|
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
|
|
return 0;
|
|
|
|
retval = rfkill_register(rt2x00dev->rfkill);
|
|
if (retval) {
|
|
ERROR(rt2x00dev, "Failed to register rfkill handler.\n");
|
|
return retval;
|
|
}
|
|
|
|
retval = input_register_polled_device(rt2x00dev->poll_dev);
|
|
if (retval) {
|
|
ERROR(rt2x00dev, "Failed to register polled device.\n");
|
|
rfkill_unregister(rt2x00dev->rfkill);
|
|
return retval;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
|
|
return;
|
|
|
|
input_unregister_polled_device(rt2x00dev->poll_dev);
|
|
rfkill_unregister(rt2x00dev->rfkill);
|
|
}
|
|
|
|
int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
struct device *device = wiphy_dev(rt2x00dev->hw->wiphy);
|
|
|
|
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
|
|
return 0;
|
|
|
|
rt2x00dev->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
|
|
if (!rt2x00dev->rfkill) {
|
|
ERROR(rt2x00dev, "Failed to allocate rfkill handler.\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
rt2x00dev->rfkill->name = rt2x00dev->ops->name;
|
|
rt2x00dev->rfkill->data = rt2x00dev;
|
|
rt2x00dev->rfkill->state = rt2x00dev->ops->lib->rfkill_poll(rt2x00dev);
|
|
rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
|
|
|
|
rt2x00dev->poll_dev = input_allocate_polled_device();
|
|
if (!rt2x00dev->poll_dev) {
|
|
ERROR(rt2x00dev, "Failed to allocate polled device.\n");
|
|
rfkill_free(rt2x00dev->rfkill);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
rt2x00dev->poll_dev->private = rt2x00dev;
|
|
rt2x00dev->poll_dev->poll = rt2x00rfkill_poll;
|
|
rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
|
|
return;
|
|
|
|
input_free_polled_device(rt2x00dev->poll_dev);
|
|
rfkill_free(rt2x00dev->rfkill);
|
|
}
|