Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (349fb2d6) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,

		if (sta_ht_inf) {
		if ((!sta_ht_inf->ht_supported) \|\|
		(!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
		(!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
		return 0;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -677,9 +677,7 @@ static int if_cs_get_int_status(struct lbs_private priv, u8 ireg)

		/* Card has a command result for us */
		if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
		spin_lock(&priv->driver_lock);
		ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
		spin_unlock(&priv->driver_lock);
		if (ret < 0)
		lbs_pr_err("could not receive cmd from card\n");
		}

+11 −2

Original line number	Diff line number	Diff line
		@@ -1393,11 +1393,20 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)

		exit:
		/*
		* Set device mode to sleep for power management.
		* Set device mode to sleep for power management,
		* on some hardware this call seems to consistently fail.
		* From the specifications it is hard to tell why it fails,
		* and if this is a "bad thing".
		* Overall it is safe to just ignore the failure and
		* continue suspending. The only downside is that the
		* device will not be in optimal power save mode, but with
		* the radio and the other components already disabled the
		* device is as good as disabled.
		*/
		retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
		if (retval)
		return retval;
		WARNING(rt2x00dev, "Device failed to enter sleep state, "
		"continue suspending.\n");

		return 0;
		}