Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[~andy/linux] / drivers / staging / vt6656 / int.c

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 89f5b18bdf1f6bc5ac93f305ff82cc4275298641..c95833ac58e024f06b8683a8920689099a34bb79 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -82,7 +82,7 @@ static int msglevel = MSG_LEVEL_INFO;
 void INTvWorkItem(void *Context)
 {
        PSDevice pDevice = (PSDevice) Context;
-       NTSTATUS ntStatus;
+       int ntStatus;
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Interrupt Polling Thread\n");
 
@@ -92,10 +92,9 @@ void INTvWorkItem(void *Context)
        spin_unlock_irq(&pDevice->lock);
 }
 
-NTSTATUS
-INTnsProcessData(PSDevice pDevice)
+int INTnsProcessData(PSDevice pDevice)
 {
-       NTSTATUS        status = STATUS_SUCCESS;
+       int status = STATUS_SUCCESS;
        PSINTData       pINTData;
        PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
        struct net_device_stats *pStats = &pDevice->stats;