aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/atm/ueagle-atm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 68b5d0dd4f98..88585da262dd 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -744,7 +744,7 @@ static inline void wake_up_cmv_ack(struct uea_softc *sc)
744 744
745static inline int wait_cmv_ack(struct uea_softc *sc) 745static inline int wait_cmv_ack(struct uea_softc *sc)
746{ 746{
747 int ret = wait_event_timeout(sc->cmv_ack_wait, 747 int ret = wait_event_interruptible_timeout(sc->cmv_ack_wait,
748 sc->cmv_ack, ACK_TIMEOUT); 748 sc->cmv_ack, ACK_TIMEOUT);
749 sc->cmv_ack = 0; 749 sc->cmv_ack = 0;
750 750
@@ -1172,7 +1172,7 @@ static int uea_kthread(void *data)
1172 if (!ret) 1172 if (!ret)
1173 ret = uea_stat(sc); 1173 ret = uea_stat(sc);
1174 if (ret != -EAGAIN) 1174 if (ret != -EAGAIN)
1175 msleep(1000); 1175 msleep_interruptible(1000);
1176 if (try_to_freeze()) 1176 if (try_to_freeze())
1177 uea_err(INS_TO_USBDEV(sc), "suspend/resume not supported, " 1177 uea_err(INS_TO_USBDEV(sc), "suspend/resume not supported, "
1178 "please unplug/replug your modem\n"); 1178 "please unplug/replug your modem\n");
@@ -1600,7 +1600,7 @@ static int uea_heavy(struct usbatm_data *usbatm, struct usb_interface *intf)
1600{ 1600{
1601 struct uea_softc *sc = usbatm->driver_data; 1601 struct uea_softc *sc = usbatm->driver_data;
1602 1602
1603 wait_event(sc->sync_q, IS_OPERATIONAL(sc)); 1603 wait_event_interruptible(sc->sync_q, IS_OPERATIONAL(sc));
1604 1604
1605 return 0; 1605 return 0;
1606 1606