iwlwifi: fix merge sequence: exit on error before state change

Browse source

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>

...

This commit is contained in:

Reinette Chatre 2008-01-30 22:05:15 -08:00 • committed by John W. Linville

parent ff5059eff2

commit e903fbd41e

2 changed files with 10 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/net/wireless/iwlwifi/iwl3945-base.c

View file

10

drivers/net/wireless/iwlwifi/iwl4965-base.c

View file