From 2e63f63cf833e2aef5ac9cffbf14cbda5a1d99e8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Oct 2008 14:21:24 -0700 Subject: [PATCH] --- yaml --- r: 126554 b: refs/heads/master c: 7c126043801fda48761691f643e1138c2d3ead43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/linux/wb35reg.c | 2 +- trunk/drivers/staging/winbond/linux/wb35rx.c | 2 +- trunk/drivers/staging/winbond/linux/wb35tx.c | 4 ++-- trunk/drivers/staging/winbond/linux/wbusb_f.h | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4407085eb980..22b2f3ac85ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1523ddc4826155b76614e75375e2bbb27b4603f7 +refs/heads/master: 7c126043801fda48761691f643e1138c2d3ead43 diff --git a/trunk/drivers/staging/winbond/linux/wb35reg.c b/trunk/drivers/staging/winbond/linux/wb35reg.c index 041be8143f1f..c2864b11a5c5 100644 --- a/trunk/drivers/staging/winbond/linux/wb35reg.c +++ b/trunk/drivers/staging/winbond/linux/wb35reg.c @@ -434,7 +434,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) reg->EP0vm_state = VM_RUNNING; - ret = wb_usb_submit_urb( urb ); + ret = usb_submit_urb(urb, GFP_ATOMIC); if (ret < 0) { #ifdef _PE_REG_DUMP_ diff --git a/trunk/drivers/staging/winbond/linux/wb35rx.c b/trunk/drivers/staging/winbond/linux/wb35rx.c index ae91b620c097..e565746713ed 100644 --- a/trunk/drivers/staging/winbond/linux/wb35rx.c +++ b/trunk/drivers/staging/winbond/linux/wb35rx.c @@ -70,7 +70,7 @@ void Wb35Rx( phw_data_t pHwData ) pWb35Rx->EP3vm_state = VM_RUNNING; - retv = wb_usb_submit_urb(urb); + retv = usb_submit_urb(urb, GFP_ATOMIC); if (retv != 0) { printk("Rx URB sending error\n"); diff --git a/trunk/drivers/staging/winbond/linux/wb35tx.c b/trunk/drivers/staging/winbond/linux/wb35tx.c index 3c40e31993ba..c54ef30a577b 100644 --- a/trunk/drivers/staging/winbond/linux/wb35tx.c +++ b/trunk/drivers/staging/winbond/linux/wb35tx.c @@ -65,7 +65,7 @@ void Wb35Tx(phw_data_t pHwData) Wb35Tx_complete, pHwData); pWb35Tx->EP4vm_state = VM_RUNNING; - retv = wb_usb_submit_urb( pUrb ); + retv = usb_submit_urb(pUrb, GFP_ATOMIC); if (retv<0) { printk("EP4 Tx Irp sending error\n"); goto cleanup; @@ -240,7 +240,7 @@ void Wb35Tx_EP2VM(phw_data_t pHwData) pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, pHwData, 32); pWb35Tx->EP2vm_state = VM_RUNNING; - retv = wb_usb_submit_urb( pUrb ); + retv = usb_submit_urb(pUrb, GFP_ATOMIC); if (retv < 0) { #ifdef _PE_TX_DUMP_ diff --git a/trunk/drivers/staging/winbond/linux/wbusb_f.h b/trunk/drivers/staging/winbond/linux/wbusb_f.h index 5a811f6c022a..db47e1d86253 100644 --- a/trunk/drivers/staging/winbond/linux/wbusb_f.h +++ b/trunk/drivers/staging/winbond/linux/wbusb_f.h @@ -16,7 +16,6 @@ void WbUsb_destroy(phw_data_t pHwData); unsigned char WbWLanInitialize(struct wb35_adapter *adapter); #define WbUsb_Stop( _A ) -#define wb_usb_submit_urb(_A) usb_submit_urb(_A, GFP_ATOMIC) #define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC) #define WbUsb_CheckForHang( _P )