diff --git a/[refs] b/[refs] index b9498ee5cfea..ed8159d694b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 926ae525111021a3fa20f26b391d091d6c945275 +refs/heads/master: ee692cfad6520f7cc60b766a3c013f9e6eba6e38 diff --git a/trunk/drivers/staging/winbond/wb35tx.c b/trunk/drivers/staging/winbond/wb35tx.c index 474cad8bf5e7..30a77ccfe480 100644 --- a/trunk/drivers/staging/winbond/wb35tx.c +++ b/trunk/drivers/staging/winbond/wb35tx.c @@ -170,11 +170,8 @@ void Wb35Tx_destroy(struct hw_data *pHwData) } while ((pWb35Tx->EP2vm_state != VM_STOP) && (pWb35Tx->EP4vm_state != VM_STOP)); msleep(10); /* Delay for waiting function enter 940623.1.b */ - if (pWb35Tx->Tx4Urb) - usb_free_urb(pWb35Tx->Tx4Urb); - - if (pWb35Tx->Tx2Urb) - usb_free_urb(pWb35Tx->Tx2Urb); + usb_free_urb(pWb35Tx->Tx4Urb); + usb_free_urb(pWb35Tx->Tx2Urb); pr_debug("Wb35Tx_destroy OK\n"); }