Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index f740325abac4..907b820a5faf 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -786,14 +786,10 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
         if ((!catc->ctrl_urb) || (!catc->tx_urb) || 
             (!catc->rx_urb) || (!catc->irq_urb)) {
                 err("No free urbs available.");
-                if (catc->ctrl_urb)
-                        usb_free_urb(catc->ctrl_urb);
-                if (catc->tx_urb)
-                        usb_free_urb(catc->tx_urb);
-                if (catc->rx_urb)
-                        usb_free_urb(catc->rx_urb);
-                if (catc->irq_urb)
-                        usb_free_urb(catc->irq_urb);
+                usb_free_urb(catc->ctrl_urb);
+                usb_free_urb(catc->tx_urb);
+                usb_free_urb(catc->rx_urb);
+                usb_free_urb(catc->irq_urb);
                 free_netdev(netdev);
                 return -ENOMEM;
         }