From 5264ccc79e0f4ca14511fe474179795f154996e9 Mon Sep 17 00:00:00 2001 From: Jay Sternberg Date: Wed, 17 Dec 2008 16:52:34 +0800 Subject: [PATCH] --- yaml --- r: 122819 b: refs/heads/master c: 91f39e8eea725347b6a82d1e35e512ec8b298b0b h: refs/heads/master i: 122817: 263b6bc2a4f8e273cce3beef067f6f0aef959a9d 122815: 1a4814e250fe23fbfe5b3a2b990b8f930bfa5894 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20473803ab73..3a1caf4b2287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1bc4ac61f2c08515afd80c6dc3962aa6d0b138b +refs/heads/master: 91f39e8eea725347b6a82d1e35e512ec8b298b0b diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index ff8635f0ed45..5da6b35cd26d 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3418,7 +3418,11 @@ static ssize_t show_tx_power(struct device *d, struct device_attribute *attr, char *buf) { struct iwl_priv *priv = (struct iwl_priv *)d->driver_data; - return sprintf(buf, "%d\n", priv->tx_power_user_lmt); + + if (!iwl_is_ready_rf(priv)) + return sprintf(buf, "off\n"); + else + return sprintf(buf, "%d\n", priv->tx_power_user_lmt); } static ssize_t store_tx_power(struct device *d,