Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6656 / usbpipe.c

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 74852eccafdf68bd7b9b260bf6d224eb22b22e5d..65e91a332a66fb69e66b5f4c7991f9c34b87de21 100644 (file)
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -38,7 +38,6 @@
  *
  */
 
-#include "umem.h"
 #include "int.h"
 #include "rxtx.h"
 #include "dpc.h"
@@ -194,7 +193,7 @@ PIPEnsControlOut(
                         usb_sndctrlpipe(pDevice->usb , 0), (char *) &pDevice->sUsbCtlRequest,
                         pbyBuffer, wLength, s_nsControlInUsbIoCompleteWrite, pDevice);
 
-       if ((ntStatus = vntwusb_submit_urb(pDevice->pControlURB) != 0)) {
+       if ((ntStatus = usb_submit_urb(pDevice->pControlURB, GFP_ATOMIC)) != 0) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control send request submission failed: %d\n", ntStatus);
                return STATUS_FAILURE;
        }
@@ -252,7 +251,7 @@ PIPEnsControlIn(
                         usb_rcvctrlpipe(pDevice->usb , 0), (char *) &pDevice->sUsbCtlRequest,
                         pbyBuffer, wLength, s_nsControlInUsbIoCompleteRead, pDevice);
 
-       if ((ntStatus = vntwusb_submit_urb(pDevice->pControlURB) != 0)) {
+       if ((ntStatus = usb_submit_urb(pDevice->pControlURB, GFP_ATOMIC)) != 0) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control request submission failed: %d\n", ntStatus);
        }else {
                MP_SET_FLAG(pDevice, fMP_CONTROL_READS);
@@ -415,7 +414,7 @@ usb_fill_bulk_urb(pDevice->pInterruptURB,
 #endif
 #endif
 
-       if ((ntStatus = vntwusb_submit_urb(pDevice->pInterruptURB)) != 0) {
+       if ((ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC)) != 0) {
            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus);
     }
 
@@ -495,7 +494,7 @@ s_nsInterruptUsbIoCompleteRead(
 
     if (pDevice->fKillEventPollingThread != TRUE) {
    #if 0               //reserve int URB submit
-       if ((ntStatus = vntwusb_submit_urb(urb)) != 0) {
+       if ((ntStatus = usb_submit_urb(urb, GFP_ATOMIC)) != 0) {
            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Re-Submit int URB failed %d\n", ntStatus);
     }
    #else                                                                                     //replace int URB submit by bulk transfer
@@ -508,7 +507,7 @@ s_nsInterruptUsbIoCompleteRead(
                     s_nsInterruptUsbIoCompleteRead,
                     pDevice);
 
-       if ((ntStatus = vntwusb_submit_urb(pDevice->pInterruptURB)) != 0) {
+       if ((ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC)) != 0) {
            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus);
            }
 
@@ -573,7 +572,7 @@ PIPEnsBulkInUsbRead(
                s_nsBulkInUsbIoCompleteRead,
                pRCB);
 
-       if((ntStatus = vntwusb_submit_urb(pUrb)!=0)){
+       if((ntStatus = usb_submit_urb(pUrb, GFP_ATOMIC)) != 0){
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit Rx URB failed %d\n", ntStatus);
                return STATUS_FAILURE ;
        }
@@ -719,7 +718,7 @@ PIPEnsSendBulkOut(
                        s_nsBulkOutIoCompleteWrite,
                        pContext);
 
-       if((status = vntwusb_submit_urb(pUrb))!=0)
+       if((status = usb_submit_urb(pUrb, GFP_ATOMIC))!=0)
        {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit Tx URB failed %d\n", status);
                return STATUS_FAILURE;