From f9345e5ea99ded3f8a0f1a2a3cffefca82431dc4 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 27 Nov 2007 21:51:39 +0100 Subject: [PATCH] --- yaml --- r: 79037 b: refs/heads/master c: 6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222 h: refs/heads/master i: 79035: 4185f3c2559cbd76fa4344f7f70e34b03c439be9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 32ced1a221f8..9341d70dd52e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61af43c56bef2cfcb8f1d9aab4e766e0f7bdd893 +refs/heads/master: 6f8a4da17ea2c8467f88a586ae1d6fcfe2c66222 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c index bbbf51d8a742..74396372e95c 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/trunk/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;