Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / bcm / InterfaceMisc.c

diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 61f878b4f56c1de900d55941e42c6a63bce3e3bd..2218faeaf8acc37944c1b34a878b47d6d3e28a23 100644 (file)
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -5,7 +5,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                PVOID buff,
                INT len)
 {
-       int retval = 0;
+       int bytes;
        USHORT usRetries = 0;
 
        if (psIntfAdapter == NULL) {
@@ -30,7 +30,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
        psIntfAdapter->psAdapter->DeviceAccess = TRUE;
 
        do {
-               retval = usb_control_msg(psIntfAdapter->udev,
+               bytes = usb_control_msg(psIntfAdapter->udev,
                                        usb_rcvctrlpipe(psIntfAdapter->udev, 0),
                                        0x02,
                                        0xC2,
@@ -41,22 +41,20 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                                        5000);
 
                usRetries++;
-               if (-ENODEV == retval) {
+               if (-ENODEV == bytes) {
                        psIntfAdapter->psAdapter->device_removed = TRUE;
                        break;
                }
 
-       } while ((retval < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
+       } while ((bytes < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
 
-       if (retval < 0) {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", retval, usRetries);
-               psIntfAdapter->psAdapter->DeviceAccess = FALSE;
-               return retval;
-       } else {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", retval);
-               psIntfAdapter->psAdapter->DeviceAccess = FALSE;
-               return STATUS_SUCCESS;
-       }
+       if (bytes < 0)
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);
+       else
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);
+
+       psIntfAdapter->psAdapter->DeviceAccess = FALSE;
+       return bytes;
 }
 
 INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,