From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Tue, 27 Nov 2007 20:51:57 +0000 (+0100)
Subject: rt2x00: Cleanup rfkill
X-Git-Tag: v2.6.25-rc1~1162^2~510
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a78b4e2a4ee7a06861e012d95acea513384001;p=linux-2.6

rt2x00: Cleanup rfkill

The label exit_free_polldev is no longer used and can be removed.
input_free_polled_device() also calls input_free_device(), so
don't call it seperatly.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index 74396372e9..34a96d44e3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/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);
 }