From 3c1cf9eaaa6b9e144cc6fa5013aadc72f0bf8391 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Wed, 7 Jan 2009 14:51:41 +0100 Subject: [PATCH] --- yaml --- r: 134091 b: refs/heads/master c: 64d74681433415855da02d2516f28d2ed859cde9 h: refs/heads/master i: 134089: 9c38f6dda9fe0c56815874ed8f40cbf7775e8109 134087: 67707019ed6a092fe0ff957cb199d1fe37260781 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a22ca46fc812..cfe817ff211d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba +refs/heads/master: 64d74681433415855da02d2516f28d2ed859cde9 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c index 595efd05ce44..53f64b76a8c1 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/trunk/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();