From dc83f6652ee46844906e76ebb9c9a717fe18e9b9 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 30 May 2012 12:31:23 +0200 Subject: [PATCH] --- yaml --- r: 314235 b: refs/heads/master c: 12b78246aa49b72f665601fdc7a44eb75fcf593b h: refs/heads/master i: 314233: 9ebce3a00e04581e247ff174be719de4a5faec59 314231: d5994e5c1a42c927c066f27d729391af5d966cc3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/devices.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 41e1651fa9e5..3f9afbc75f92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6de4902ee8e07252d335b16810cb73432cf0d514 +refs/heads/master: 12b78246aa49b72f665601fdc7a44eb75fcf593b diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c b/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c index 747e576950f4..d12f0631b67a 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c @@ -96,10 +96,7 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv) /* NIC configuration for 1000 series */ static void iwl1000_nic_config(struct iwl_priv *priv) { - /* set CSR_HW_CONFIG_REG for uCode use */ - iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG, - CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | - CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); + iwl_rf_config(priv); /* Setting digital SVR for 1000 card to 1.32V */ /* locking is acquired in iwl_set_bits_mask_prph() function */