diff options
| author |   Harsh Kumar <harsh1kumar@gmail.com> | 2013-05-30 10:05:02 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:59:47 +0900 |
| commit | b5153e973f4688df69ae4e8614d054609a40ad4e (patch) | |
| tree | 944008894fe4a05bbcbfecbc6912176eca72e2cd /drivers/staging/winbond | |
| parent | staging: fwserial: Use normal logging styles (diff) | |
| download | linux-dev-b5153e973f4688df69ae4e8614d054609a40ad4e.tar.xz linux-dev-b5153e973f4688df69ae4e8614d054609a40ad4e.zip | |
Staging: winbond: usb_free_urb(NULL) is safe
usb_free_urb(NULL) is safe. So, the check was removed. Also, couple of checkpatch.pl fixes
Signed-off-by: Harsh Kumar <harsh1kumar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/winbond')
| -rw-r--r-- | drivers/staging/winbond/phy_calibration.c | 2 | ||||
| -rw-r--r-- | drivers/staging/winbond/wb35reg.c | 14 | ||||
| -rw-r--r-- | drivers/staging/winbond/wb35rx.c | 3 |
3 files changed, 7 insertions, 12 deletions
diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c index cabae3466704..cfbfbbb53866 100644 --- a/drivers/staging/winbond/phy_calibration.c +++ b/drivers/staging/winbond/phy_calibration.c @@ -296,7 +296,7 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos) } } -static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue) +static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 *pValue) { if (number < 0x1000) number += 0x1000; diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c index 1bff7d1c9a77..01942049dd39 100644 --- a/drivers/staging/winbond/wb35reg.c +++ b/drivers/staging/winbond/wb35reg.c @@ -64,12 +64,11 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p return true; } else { - if (urb) - usb_free_urb(urb); + usb_free_urb(urb); kfree(reg_queue); return false; } - return false; + return false; } void Wb35Reg_Update(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue) @@ -206,8 +205,7 @@ unsigned char Wb35Reg_Write(struct hw_data *pHwData, u16 RegisterNo, u32 Registe return true; } else { - if (urb) - usb_free_urb(urb); + usb_free_urb(urb); kfree(reg_queue); return false; } @@ -270,8 +268,7 @@ unsigned char Wb35Reg_WriteWithCallbackValue(struct hw_data *pHwData, Wb35Reg_EP0VM_start(pHwData); return true; } else { - if (urb) - usb_free_urb(urb); + usb_free_urb(urb); kfree(reg_queue); return false; } @@ -374,8 +371,7 @@ unsigned char Wb35Reg_Read(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegist return true; } else { - if (urb) - usb_free_urb(urb); + usb_free_urb(urb); kfree(reg_queue); return false; } diff --git a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c index f118eeba396a..8d71bc2f5940 100644 --- a/drivers/staging/winbond/wb35rx.c +++ b/drivers/staging/winbond/wb35rx.c @@ -343,8 +343,7 @@ void Wb35Rx_destroy(struct hw_data *pHwData) } while (pWb35Rx->EP3vm_state != VM_STOP); msleep(10); /* Delay for waiting function exit */ - if (pWb35Rx->RxUrb) - usb_free_urb(pWb35Rx->RxUrb); + usb_free_urb(pWb35Rx->RxUrb); pr_debug("Wb35Rx_destroy OK\n"); } |