Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (103 commits)
  usbcore: remove unused argument in autosuspend
  USB: keep count of unsuspended children
  USB hub: simplify remote-wakeup handling
  USB: struct usb_device: change flag to bitflag
  OHCI: make autostop conditional on CONFIG_PM
  USB: Add autosuspend support to the hub driver
  EHCI: Fix root-hub and port suspend/resume problems
  USB: create a new thread for every USB device found during the probe sequence
  USB: add driver for the USB debug devices
  USB: added dynamic major number for USB endpoints
  USB: pegasus error path not resetting task's state
  USB: endianness fix for asix.c
  USB: build the appledisplay driver
  USB serial: replace kmalloc+memset with kzalloc
  USB: hid-core: canonical defines for Apple USB device IDs
  USB: idmouse cleanup
  USB: make drivers/usb/core/driver.c:usb_device_match() static
  USB: lh7a40x_udc remove double declaration
  USB: pxa2xx_udc recognizes ixp425 rev b0 chip
  usbtouchscreen: add support for DMC TSC-10/25 devices
  ...

6 files changed, 10 insertions, 15 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f920e0ccacd3..1f787333d18c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1953,8 +1953,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         return hdw;
  fail:
         if (hdw) {
-                if (hdw->ctl_read_urb) usb_free_urb(hdw->ctl_read_urb);
-                if (hdw->ctl_write_urb) usb_free_urb(hdw->ctl_write_urb);
+                usb_free_urb(hdw->ctl_read_urb);
+                usb_free_urb(hdw->ctl_write_urb);
                 if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer);
                 if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer);
                 if (hdw->controls) kfree(hdw->controls);
@@ -2575,12 +2575,10 @@ static void pvr2_ctl_timeout(unsigned long data)
         struct pvr2_hdw *hdw = (struct pvr2_hdw *)data;
         if (hdw->ctl_write_pend_flag || hdw->ctl_read_pend_flag) {
                 hdw->ctl_timeout_flag = !0;
-                if (hdw->ctl_write_pend_flag && hdw->ctl_write_urb) {
+                if (hdw->ctl_write_pend_flag)
                         usb_unlink_urb(hdw->ctl_write_urb);
-                }
-                if (hdw->ctl_read_pend_flag && hdw->ctl_read_urb) {
+                if (hdw->ctl_read_pend_flag)
                         usb_unlink_urb(hdw->ctl_read_urb);
-                }
         }
 }
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 70aa63eba0cb..57fb32033543 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -289,7 +289,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp)
         pvr2_buffer_set_none(bp);
         bp->signature = 0;
         bp->stream = NULL;
-        if (bp->purb) usb_free_urb(bp->purb);
+        usb_free_urb(bp->purb);
         pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
                    " bufferDone     %p",bp);
 }
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index e8db6e58d390..a996aad79276 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -866,11 +866,9 @@ int pwc_isoc_init(struct pwc_device *pdev)
         }
         if (ret) {
                 /* De-allocate in reverse order */
-                while (i >= 0) {
-                        if (pdev->sbuf[i].urb != NULL)
-                                usb_free_urb(pdev->sbuf[i].urb);
+                while (i--) {
+                        usb_free_urb(pdev->sbuf[i].urb);
                         pdev->sbuf[i].urb = NULL;
-                        i--;
                 }
                 return ret;
         }
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 42fb60d985b9..18458d46c0ff 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -775,7 +775,7 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
         return 0;
 
 free_urbs:
-        for (i = 0; (i < SN9C102_URBS) &&  cam->urb[i]; i++)
+        for (i = 0; i < SN9C102_URBS; i++)
                 usb_free_urb(cam->urb[i]);
 
 free_buffers:
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 9a26b9484aae..bbf2beeeb449 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -190,8 +190,7 @@ static int qcm_alloc_int_urb(struct qcm *cam)
 
 static void qcm_free_int(struct qcm *cam)
 {
-        if (cam->button_urb)
-                usb_free_urb(cam->button_urb);
+        usb_free_urb(cam->button_urb);
 }
 #endif /* CONFIG_INPUT */
 
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 5b5563424422..52d0f759ee00 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -489,7 +489,7 @@ static int zc0301_start_transfer(struct zc0301_device* cam)
         return 0;
 
 free_urbs:
-        for (i = 0; (i < ZC0301_URBS) &&  cam->urb[i]; i++)
+        for (i = 0; i < ZC0301_URBS; i++)
                 usb_free_urb(cam->urb[i]);
 
 free_buffers: