]> err.no Git - linux-2.6/commit
iwlwifi: fix merge sequence: exit on error before state change
authorReinette Chatre <reinette.chatre@intel.com>
Thu, 31 Jan 2008 06:05:15 +0000 (22:05 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 1 Feb 2008 21:14:21 +0000 (16:14 -0500)
commite903fbd41e9a723da194e91816bfb69d442eb116
tree88a8ca0c8be3a9a41b46e2826ea370c49892ad95
parentff5059eff254fbe1d2aa4f47e24aa6fc71b98e65
iwlwifi: fix merge sequence: exit on error before state change

The intention behind the original patch:
"iwlwifi: fix possible read attempt on ucode that is not available"
was to exit before any state is changed. Due to its submission directly
to 2.6.24 it was not clear how this relates to the latest iwlwifi work.

This patch does exactly the same as the previous patch, just earlier to
prevent any state from being changed if there is an error.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c