From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 9 Nov 2005 05:47:08 +0000 (-0500)
Subject: Merge rsync://bughost.org/repos/ipw-delta/
X-Git-Tag: v2.6.15-rc1~69^2~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=eedb9f09e92598c165de37a8c210434d270ca3a6;p=linux-2.6-omap-h63xx.git

Merge rsync://bughost.org/repos/ipw-delta/
---

eedb9f09e92598c165de37a8c210434d270ca3a6
diff --cc drivers/net/wireless/ipw2100.c
index 4f19ac7d63a,76841cb8301..877ac514aa0
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@@ -6070,9 -6064,11 +6063,10 @@@ static int ipw2100_wpa_set_encryption(s
  			ret = -ENOMEM;
  			goto done;
  		}
 -		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
  		new_crypt->ops = ops;
  		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
- 			new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+ 			new_crypt->priv =
+ 			    new_crypt->ops->init(param->u.crypt.idx);
  
  		if (new_crypt->priv == NULL) {
  			kfree(new_crypt);