Commit b5153e97 authored by Harsh Kumar's avatar Harsh Kumar Committed by Greg Kroah-Hartman

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: default avatarHarsh Kumar <harsh1kumar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e8661ed
...@@ -296,7 +296,7 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos) ...@@ -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) if (number < 0x1000)
number += 0x1000; number += 0x1000;
......
...@@ -64,12 +64,11 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p ...@@ -64,12 +64,11 @@ unsigned char Wb35Reg_BurstWrite(struct hw_data *pHwData, u16 RegisterNo, u32 *p
return true; return true;
} else { } else {
if (urb) usb_free_urb(urb);
usb_free_urb(urb);
kfree(reg_queue); kfree(reg_queue);
return false; return false;
} }
return false; return false;
} }
void Wb35Reg_Update(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue) 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 ...@@ -206,8 +205,7 @@ unsigned char Wb35Reg_Write(struct hw_data *pHwData, u16 RegisterNo, u32 Registe
return true; return true;
} else { } else {
if (urb) usb_free_urb(urb);
usb_free_urb(urb);
kfree(reg_queue); kfree(reg_queue);
return false; return false;
} }
...@@ -270,8 +268,7 @@ unsigned char Wb35Reg_WriteWithCallbackValue(struct hw_data *pHwData, ...@@ -270,8 +268,7 @@ unsigned char Wb35Reg_WriteWithCallbackValue(struct hw_data *pHwData,
Wb35Reg_EP0VM_start(pHwData); Wb35Reg_EP0VM_start(pHwData);
return true; return true;
} else { } else {
if (urb) usb_free_urb(urb);
usb_free_urb(urb);
kfree(reg_queue); kfree(reg_queue);
return false; return false;
} }
...@@ -374,8 +371,7 @@ unsigned char Wb35Reg_Read(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegist ...@@ -374,8 +371,7 @@ unsigned char Wb35Reg_Read(struct hw_data *pHwData, u16 RegisterNo, u32 *pRegist
return true; return true;
} else { } else {
if (urb) usb_free_urb(urb);
usb_free_urb(urb);
kfree(reg_queue); kfree(reg_queue);
return false; return false;
} }
......
...@@ -343,8 +343,7 @@ void Wb35Rx_destroy(struct hw_data *pHwData) ...@@ -343,8 +343,7 @@ void Wb35Rx_destroy(struct hw_data *pHwData)
} while (pWb35Rx->EP3vm_state != VM_STOP); } while (pWb35Rx->EP3vm_state != VM_STOP);
msleep(10); /* Delay for waiting function exit */ 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"); pr_debug("Wb35Rx_destroy OK\n");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment