Lines 65-71
Link Here
|
65 |
#include "drivers/lirc_dev/lirc_dev.h" |
65 |
#include "drivers/lirc_dev/lirc_dev.h" |
66 |
|
66 |
|
67 |
#if !defined(KERNEL_2_5) |
67 |
#if !defined(KERNEL_2_5) |
68 |
#define USB_CTRL_GET_TIMEOUT 5 |
68 |
#define USB_CTRL_GET_TIMEOUT 5*HZ |
69 |
#endif |
69 |
#endif |
70 |
|
70 |
|
71 |
/* module identification */ |
71 |
/* module identification */ |
Lines 290-296
Link Here
|
290 |
GET_INFRACODE, USB_TYPE_VENDOR|USB_DIR_IN, |
290 |
GET_INFRACODE, USB_TYPE_VENDOR|USB_DIR_IN, |
291 |
0/* offset */, /*unused*/0, |
291 |
0/* offset */, /*unused*/0, |
292 |
ir->buf_in, ir->len_in, |
292 |
ir->buf_in, ir->len_in, |
293 |
/*timeout*/HZ * USB_CTRL_GET_TIMEOUT); |
293 |
/*timeout*/USB_CTRL_GET_TIMEOUT); |
294 |
if (ret > 0) { |
294 |
if (ret > 0) { |
295 |
int i = DEVICE_HEADERLEN; |
295 |
int i = DEVICE_HEADERLEN; |
296 |
lirc_t code, timediff; |
296 |
lirc_t code, timediff; |
Lines 346-352
Link Here
|
346 |
SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN, |
346 |
SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN, |
347 |
/*unused*/0, /*unused*/0, |
347 |
/*unused*/0, /*unused*/0, |
348 |
/*dummy*/ir->buf_in, /*dummy*/ir->len_in, |
348 |
/*dummy*/ir->buf_in, /*dummy*/ir->len_in, |
349 |
/*timeout*/HZ * USB_CTRL_GET_TIMEOUT); |
349 |
/*timeout*/USB_CTRL_GET_TIMEOUT); |
350 |
if (ret < 0) |
350 |
if (ret < 0) |
351 |
printk(KERN_WARNING DRIVER_NAME |
351 |
printk(KERN_WARNING DRIVER_NAME |
352 |
"[%d]: SET_INFRABUFFER_EMPTY: error %d\n", |
352 |
"[%d]: SET_INFRABUFFER_EMPTY: error %d\n", |
Lines 518-524
Link Here
|
518 |
SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN, |
518 |
SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN, |
519 |
/*unused*/0, /*unused*/0, |
519 |
/*unused*/0, /*unused*/0, |
520 |
/*dummy*/ir->buf_in, /*dummy*/ir->len_in, |
520 |
/*dummy*/ir->buf_in, /*dummy*/ir->len_in, |
521 |
/*timeout*/HZ * USB_CTRL_GET_TIMEOUT); |
521 |
/*timeout*/USB_CTRL_GET_TIMEOUT); |
522 |
if (ret < 0) |
522 |
if (ret < 0) |
523 |
printk(KERN_WARNING DRIVER_NAME |
523 |
printk(KERN_WARNING DRIVER_NAME |
524 |
"[%d]: SET_INFRABUFFER_EMPTY: error %d\n", |
524 |
"[%d]: SET_INFRABUFFER_EMPTY: error %d\n", |