diff options
Diffstat (limited to 'drivers/staging/vt6656/firmware.c')
| -rw-r--r-- | drivers/staging/vt6656/firmware.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index cd2ea76c8b1e..1159f0b34578 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -31,9 +31,9 @@ * */ +#include <linux/compiler.h> #include "firmware.h" -#include "control.h" -#include "rndis.h" +#include "usbpipe.h" static int msglevel = MSG_LEVEL_INFO; /* static int msglevel = MSG_LEVEL_DEBUG; */ @@ -54,7 +54,6 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) int ii, rc; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Download firmware\n"); - spin_unlock_irq(&pDevice->lock); rc = request_firmware(&fw, FIRMWARE_NAME, dev); if (rc) { @@ -71,7 +70,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice) wLength = min_t(int, fw->size - ii, FIRMWARE_CHUNK_SIZE); memcpy(pBuffer, fw->data + ii, wLength); - NdisStatus = CONTROLnsRequestOutAsyn(pDevice, + NdisStatus = vnt_control_out(pDevice, 0, 0x1200+ii, 0x0000, @@ -91,7 +90,6 @@ free_fw: out: kfree(pBuffer); - spin_lock_irq(&pDevice->lock); return result; } MODULE_FIRMWARE(FIRMWARE_NAME); @@ -102,7 +100,7 @@ int FIRMWAREbBrach2Sram(struct vnt_private *pDevice) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n"); - NdisStatus = CONTROLnsRequestOut(pDevice, + NdisStatus = vnt_control_out(pDevice, 1, 0x1200, 0x0000, @@ -118,7 +116,7 @@ int FIRMWAREbCheckVersion(struct vnt_private *pDevice) { int ntStatus; - ntStatus = CONTROLnsRequestIn(pDevice, + ntStatus = vnt_control_in(pDevice, MESSAGE_TYPE_READ, 0, MESSAGE_REQUEST_VERSION, |