diff --git a/[refs] b/[refs] index 9341d70dd52e..13f0ff6a0b7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222 +refs/heads/master: b3a78b4e2a4ee7a06861e012d95acea513384001 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c index 74396372e95c..34a96d44e306 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c @@ -148,9 +148,6 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) return 0; -exit_free_polldev: - input_free_polled_device(rt2x00dev->poll_dev); - exit_free_rfkill: rfkill_free(rt2x00dev->rfkill); @@ -163,7 +160,6 @@ void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev) if (!test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) return; - input_free_device(rt2x00dev->poll_dev->input); input_free_polled_device(rt2x00dev->poll_dev); rfkill_free(rt2x00dev->rfkill); }