diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2009-01-07 14:51:41 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:59:57 -0500 |
| commit | 64d74681433415855da02d2516f28d2ed859cde9 (patch) | |
| tree | f4c2a530ca649ca18ca547ccc702f740d7e6bebf /drivers | |
| parent | 46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba (diff) | |
rt2x00: Only register rfkill input when key is present
rt2x00 should only register the RFKILL input device when the hardware indicated
the key was present.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00rfkill.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index 595efd05ce44..53f64b76a8c1 100644 --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c @@ -87,7 +87,8 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) { struct input_polled_dev *poll_dev; - if (test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state)) + if (test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state) || + !test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) return; poll_dev = input_allocate_polled_device(); |