---

yaml --- r: 219640 b: refs/heads/master c: 27264fb h: refs/heads/master v: v3
git-mirror · Aug 31, 2010 · 40c41d5 · 40c41d5
1 parent eddacc8
commit 40c41d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 203e4615ee9d9fa8d3506b9d0ef30095e4d5bc90
+refs/heads/master: 27264fb8c74ab936fdcc0fb2ec9264bf13ba3baf
diff --git a/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h
@@ -258,16 +258,13 @@ typedef enum _VIA_PKT_TYPE
 
 //++ NDIS related
 
-#define NDIS_STATUS     int
-
 typedef enum __DEVICE_NDIS_STATUS {
     STATUS_SUCCESS = 0,
     STATUS_FAILURE,
     STATUS_RESOURCES,
     STATUS_PENDING,
 } DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS;
 
-
 #define MAX_BSSIDINFO_4_PMKID   16
 #define MAX_PMKIDLIST           5
 //Flags for PMKID Candidate list structure

diff --git a/trunk/drivers/staging/vt6656/firmware.c b/trunk/drivers/staging/vt6656/firmware.c
@@ -773,7 +773,7 @@ FIRMWAREbDownload(
      PSDevice pDevice
     )
 {
-    NDIS_STATUS NdisStatus;
+    int NdisStatus;
     PBYTE       pBuffer = NULL;
     WORD        wLength;
     int         ii;
@@ -823,7 +823,7 @@ FIRMWAREbBrach2Sram(
      PSDevice pDevice
     )
 {
-    NDIS_STATUS NdisStatus;
+    int NdisStatus;
 
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n");
 

diff --git a/trunk/drivers/staging/vt6656/usbpipe.c b/trunk/drivers/staging/vt6656/usbpipe.c
@@ -618,7 +618,7 @@ s_nsBulkInUsbIoCompleteRead(
  * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver
  *
  */
-NDIS_STATUS
+int
 PIPEnsSendBulkOut(
       PSDevice pDevice,
       PUSB_SEND_CONTEXT pContext