aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rtl8192u/r8192U_core.c')
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index b5941ae410d9..ac7872ea0cb1 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -266,7 +266,7 @@ int write_nic_byte_E(struct net_device *dev, int indx, u8 data)
266 266
267 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 267 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
268 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 268 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
269 indx | 0xfe00, 0, usbdata, 1, HZ / 2); 269 indx | 0xfe00, 0, usbdata, 1, 500);
270 kfree(usbdata); 270 kfree(usbdata);
271 271
272 if (status < 0) { 272 if (status < 0) {
@@ -288,7 +288,7 @@ int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
288 288
289 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 289 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
290 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 290 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
291 indx | 0xfe00, 0, usbdata, 1, HZ / 2); 291 indx | 0xfe00, 0, usbdata, 1, 500);
292 *data = *usbdata; 292 *data = *usbdata;
293 kfree(usbdata); 293 kfree(usbdata);
294 294
@@ -316,7 +316,7 @@ int write_nic_byte(struct net_device *dev, int indx, u8 data)
316 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 316 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
317 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 317 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
318 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 318 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
319 usbdata, 1, HZ / 2); 319 usbdata, 1, 500);
320 kfree(usbdata); 320 kfree(usbdata);
321 321
322 if (status < 0) { 322 if (status < 0) {
@@ -343,7 +343,7 @@ int write_nic_word(struct net_device *dev, int indx, u16 data)
343 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 343 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
344 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 344 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
345 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 345 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
346 usbdata, 2, HZ / 2); 346 usbdata, 2, 500);
347 kfree(usbdata); 347 kfree(usbdata);
348 348
349 if (status < 0) { 349 if (status < 0) {
@@ -370,7 +370,7 @@ int write_nic_dword(struct net_device *dev, int indx, u32 data)
370 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 370 status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
371 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE, 371 RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
372 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 372 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
373 usbdata, 4, HZ / 2); 373 usbdata, 4, 500);
374 kfree(usbdata); 374 kfree(usbdata);
375 375
376 376
@@ -397,7 +397,7 @@ int read_nic_byte(struct net_device *dev, int indx, u8 *data)
397 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 397 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
398 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 398 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
399 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 399 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
400 usbdata, 1, HZ / 2); 400 usbdata, 1, 500);
401 *data = *usbdata; 401 *data = *usbdata;
402 kfree(usbdata); 402 kfree(usbdata);
403 403
@@ -424,7 +424,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data)
424 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 424 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
425 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 425 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
426 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 426 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
427 usbdata, 2, HZ / 2); 427 usbdata, 2, 500);
428 *data = *usbdata; 428 *data = *usbdata;
429 kfree(usbdata); 429 kfree(usbdata);
430 430
@@ -448,7 +448,7 @@ static int read_nic_word_E(struct net_device *dev, int indx, u16 *data)
448 448
449 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 449 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
450 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 450 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
451 indx | 0xfe00, 0, usbdata, 2, HZ / 2); 451 indx | 0xfe00, 0, usbdata, 2, 500);
452 *data = *usbdata; 452 *data = *usbdata;
453 kfree(usbdata); 453 kfree(usbdata);
454 454
@@ -474,7 +474,7 @@ int read_nic_dword(struct net_device *dev, int indx, u32 *data)
474 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 474 status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
475 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ, 475 RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
476 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f, 476 (indx & 0xff) | 0xff00, (indx >> 8) & 0x0f,
477 usbdata, 4, HZ / 2); 477 usbdata, 4, 500);
478 *data = *usbdata; 478 *data = *usbdata;
479 kfree(usbdata); 479 kfree(usbdata);
480 480
@@ -3418,7 +3418,7 @@ static void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
3418 u32 *TotalRxDataNum) 3418 u32 *TotalRxDataNum)
3419{ 3419{
3420 u16 SlotIndex; 3420 u16 SlotIndex;
3421 u8 i; 3421 u16 i;
3422 3422
3423 *TotalRxBcnNum = 0; 3423 *TotalRxBcnNum = 0;
3424 *TotalRxDataNum = 0; 3424 *TotalRxDataNum = 0;