|
@@ -659,7 +659,7 @@ static void __vub300_irqpoll_response(struct vub300_mmc_host *vub300)
|
|
static void __do_poll(struct vub300_mmc_host *vub300)
|
|
static void __do_poll(struct vub300_mmc_host *vub300)
|
|
{
|
|
{
|
|
/* cmd_mutex is held by vub300_pollwork_thread */
|
|
/* cmd_mutex is held by vub300_pollwork_thread */
|
|
- long commretval;
|
|
|
|
|
|
+ unsigned long commretval;
|
|
mod_timer(&vub300->inactivity_timer, jiffies + HZ);
|
|
mod_timer(&vub300->inactivity_timer, jiffies + HZ);
|
|
init_completion(&vub300->irqpoll_complete);
|
|
init_completion(&vub300->irqpoll_complete);
|
|
send_irqpoll(vub300);
|
|
send_irqpoll(vub300);
|
|
@@ -671,8 +671,6 @@ static void __do_poll(struct vub300_mmc_host *vub300)
|
|
vub300->usb_timed_out = 1;
|
|
vub300->usb_timed_out = 1;
|
|
usb_kill_urb(vub300->command_out_urb);
|
|
usb_kill_urb(vub300->command_out_urb);
|
|
usb_kill_urb(vub300->command_res_urb);
|
|
usb_kill_urb(vub300->command_res_urb);
|
|
- } else if (commretval < 0) {
|
|
|
|
- vub300_queue_poll_work(vub300, 1);
|
|
|
|
} else { /* commretval > 0 */
|
|
} else { /* commretval > 0 */
|
|
__vub300_irqpoll_response(vub300);
|
|
__vub300_irqpoll_response(vub300);
|
|
}
|
|
}
|