From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 2 Oct 2006 15:56:58 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95f3eff6997ae4a6754c1d874ec0a414d97c44d1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  [netdrvr] hp100: encapsulate all non-module code
  drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
  [netdrvr] phy: Fix bugs in error handling
  [PATCH] spidernet: Use pci_dma_mapping_error()
  [PATCH] sky2: version 1.9
  [PATCH] sky2: fragmented receive for large MTU
  [PATCH] sky2: use netif_tx_lock instead of LLTX
  [PATCH] sky2: incremental transmit completion
  [PATCH] sky2: name irq after eth for irqbalance
  [PATCH] sky2: workarounds for some 88e806x chips
  [PATCH] sky2: use standard pci register capabilties for error register
  [PATCH] sky2: gigabit full duplex negotiation
  e100, e1000, ixgb: increment version numbers
  ixgb: convert to netdev_priv(netdev)
  ixgb: combine more rx descriptors to improve performance
  e1000: possible memory leak in e1000_set_ringparam
  e1000: Janitor: Use #defined values for literals
  e1000: don't strip vlan ID if 8021q claims it
  e1000: rework polarity, NVM, eeprom code and fixes.
  e1000: driver state fixes (race fix)
  ...
---

95f3eff6997ae4a6754c1d874ec0a414d97c44d1
diff --cc drivers/net/wireless/ipw2100.c
index eddfa8786e83,8ec9b73bbdd4..599e2fe76188
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@@ -6540,14 -6535,16 +6542,17 @@@ static int __init ipw2100_init(void
  	printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
  
  	ret = pci_register_driver(&ipw2100_pci_driver);
+ 	if (ret)
+ 		goto out;
  
 +	set_acceptable_latency("ipw2100", INFINITE_LATENCY);
  #ifdef CONFIG_IPW2100_DEBUG
  	ipw2100_debug_level = debug;
- 	driver_create_file(&ipw2100_pci_driver.driver,
- 			   &driver_attr_debug_level);
+ 	ret = driver_create_file(&ipw2100_pci_driver.driver,
+ 				 &driver_attr_debug_level);
  #endif
  
+ out:
  	return ret;
  }