]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
rt2x00: Cleanup rfkill
authorIvo van Doorn <ivdoorn@gmail.com>
Tue, 27 Nov 2007 20:51:57 +0000 (21:51 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:05:11 +0000 (15:05 -0800)
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>
drivers/net/wireless/rt2x00/rt2x00rfkill.c

index 74396372e95ca0a9a385de36806124a21ce2e80a..34a96d44e306cfb3714782c6f1fad80e810598a0 100644 (file)
@@ -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);
 }