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/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 2cfba8488a93..3d5072f14b8d 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -953,32 +953,28 @@ probe_error:
                 port = serial->port[i];
                 if (!port)
                         continue;
-                if (port->read_urb)
-                        usb_free_urb (port->read_urb);
+                usb_free_urb(port->read_urb);
                 kfree(port->bulk_in_buffer);
         }
         for (i = 0; i < num_bulk_out; ++i) {
                 port = serial->port[i];
                 if (!port)
                         continue;
-                if (port->write_urb)
-                        usb_free_urb (port->write_urb);
+                usb_free_urb(port->write_urb);
                 kfree(port->bulk_out_buffer);
         }
         for (i = 0; i < num_interrupt_in; ++i) {
                 port = serial->port[i];
                 if (!port)
                         continue;
-                if (port->interrupt_in_urb)
-                        usb_free_urb (port->interrupt_in_urb);
+                usb_free_urb(port->interrupt_in_urb);
                 kfree(port->interrupt_in_buffer);
         }
         for (i = 0; i < num_interrupt_out; ++i) {
                 port = serial->port[i];
                 if (!port)
                         continue;
-                if (port->interrupt_out_urb)
-                        usb_free_urb (port->interrupt_out_urb);
+                usb_free_urb(port->interrupt_out_urb);
                 kfree(port->interrupt_out_buffer);
         }