Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: winbond: usb_free_urb(NULL) is safe

Browse Source 
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>
This commit is contained in:
Harsh Kumar 2013-05-30 10:05:02 +05:30 committed by Greg Kroah-Hartman
parent 6e8661ed30
commit b5153e973f
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/winbond/phy_calibration.c
View File

@ -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;

14
drivers/staging/winbond/wb35reg.c
View File

@ -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
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,
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
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;
} }

3
drivers/staging/winbond/wb35rx.c
View File

@ -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");
} }