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@xxxxxxxxxxxx>
---
Index: wireless-2.6/drivers/net/wireless/rt2x00/rt2x00rfkill.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ wireless-2.6/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -141,12 +141,6 @@ int rt2x00rfkill_allocate(struct rt2x00_
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
