From 33894517de1de766fe341d68da487eb629e6542a Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Wed, 9 Dec 2009 19:29:16 +0000 Subject: [PATCH] Revert "svn-1280" This reverts commit b6dfd1656b03fe7a24b770aeb5109a04db3ca6fb. --- drivers/net/wireless/airport.c | 2 +- drivers/net/wireless/orinoco.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 02af0d4..ba3fa27 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c @@ -153,7 +153,7 @@ static int airport_hard_reset(struct orinoco_private *priv) /* Vitally important. If we don't do this it seems we get an * interrupt somewhere during the power cycle, since * hw_unavailable is already set it doesn't get ACKed, we get - * into an interrupt loop and the PMU decides to turn us + * into an interrupt loop and the the PMU decides to turn us * off. */ disable_irq(dev->irq); diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index ec17623..acaf4fe 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -4284,6 +4284,12 @@ static void orinoco_get_drvinfo(struct net_device *dev, strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1); strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1); strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1); + if (dev->dev.parent) + strncpy(info->bus_info, dev->dev.parent->bus_id, + sizeof(info->bus_info) - 1); + else + snprintf(info->bus_info, sizeof(info->bus_info) - 1, + "PCMCIA %p", priv->hw.iobase); } static struct ethtool_ops orinoco_ethtool_ops = { -- 2.11.4.GIT