diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2007-11-27 21:51:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:05:10 -0800 |
| commit | 6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222 (patch) | |
| tree | dc6d4e50adfe470af65fe29ee7024cb51f384d05 /drivers/net/wireless/rt2x00/rt2x00rfkill.c | |
| parent | 61af43c56bef2cfcb8f1d9aab4e766e0f7bdd893 (diff) | |
| download | blackbird-op-linux-6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222.tar.gz blackbird-op-linux-6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222.zip | |
rt2x00: Remove redundant code in rfkill setup
In rt2x00rfkill.c, routine input_allocate_device() is called even though
input_allocate_polled_device(), which was just called, includes a call to
that routine. This patch, which has not been tested, removes the redundant code.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00rfkill.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00rfkill.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index bbbf51d8a742..74396372e95c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c @@ -136,12 +136,6 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev) rt2x00dev->poll_dev->poll = rt2x00rfkill_poll; rt2x00dev->poll_dev->poll_interval = RFKILL_POLL_INTERVAL; - rt2x00dev->poll_dev->input = input_allocate_device(); - if (!rt2x00dev->poll_dev->input) { - ERROR(rt2x00dev, "Failed to allocate input device.\n"); - goto exit_free_polldev; - } - rt2x00dev->poll_dev->input->name = rt2x00dev->ops->name; rt2x00dev->poll_dev->input->phys = wiphy_name(rt2x00dev->hw->wiphy); rt2x00dev->poll_dev->input->id.bustype = BUS_HOST; |
