leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: ft1000: Replace timeout values with USB_CTRL_G(S)ET_TIMEOUT.

Browse Source 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marek Belisko 2012-07-30 23:07:17 +02:00 committed by Greg Kroah-Hartman
parent 18978952c1
commit b0add95059
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View File

@ -110,7 +110,7 @@ int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data,
nRegIndx, nRegIndx,
Data, Data,
2, 2,
LARGE_TIMEOUT); USB_CTRL_GET_TIMEOUT);
return ret; return ret;
} }
@ -143,7 +143,7 @@ int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value,
nRegIndx, nRegIndx,
NULL, NULL,
0, 0,
LARGE_TIMEOUT); USB_CTRL_SET_TIMEOUT);
return ret; return ret;
} }
@ -178,7 +178,7 @@ int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
indx, indx,
buffer, buffer,
cnt, cnt,
LARGE_TIMEOUT); USB_CTRL_GET_TIMEOUT);
return ret; return ret;
} }
@ -215,7 +215,7 @@ int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
indx, indx,
buffer, buffer,
cnt, cnt,
LARGE_TIMEOUT); USB_CTRL_SET_TIMEOUT);
return ret; return ret;
} }
@ -255,7 +255,7 @@ int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
indx, indx,
buffer, buffer,
2, 2,
LARGE_TIMEOUT); USB_CTRL_GET_TIMEOUT);
return ret; return ret;
} }
@ -294,7 +294,7 @@ int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u
indx, indx,
NULL, NULL,
0, 0,
LARGE_TIMEOUT); USB_CTRL_SET_TIMEOUT);
return ret; return ret;
} }

2
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
View File

@ -36,8 +36,6 @@ struct app_info_block {
#define FT1000_STATUS_CLOSING 0x01 #define FT1000_STATUS_CLOSING 0x01
#define LARGE_TIMEOUT 5000
#define DSPBCMSGID 0x10 #define DSPBCMSGID 0x10
/* Electrabuzz specific DPRAM mapping */ /* Electrabuzz specific DPRAM mapping */