aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/usbaudio.c')
-rw-r--r--sound/usb/usbaudio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 3eaa08e3e6a6..f2b760d8d77e 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -792,7 +792,7 @@ static int start_urbs(snd_usb_substream_t *subs, snd_pcm_runtime_t *runtime)
792 */ 792 */
793static int wait_clear_urbs(snd_usb_substream_t *subs) 793static int wait_clear_urbs(snd_usb_substream_t *subs)
794{ 794{
795 int timeout = HZ; 795 unsigned long end_time = jiffies + msecs_to_jiffies(1000);
796 unsigned int i; 796 unsigned int i;
797 int alive; 797 int alive;
798 798
@@ -812,7 +812,7 @@ static int wait_clear_urbs(snd_usb_substream_t *subs)
812 break; 812 break;
813 set_current_state(TASK_UNINTERRUPTIBLE); 813 set_current_state(TASK_UNINTERRUPTIBLE);
814 schedule_timeout(1); 814 schedule_timeout(1);
815 } while (--timeout > 0); 815 } while (time_before(jiffies, end_time));
816 if (alive) 816 if (alive)
817 snd_printk(KERN_ERR "timeout: still %d active urbs..\n", alive); 817 snd_printk(KERN_ERR "timeout: still %d active urbs..\n", alive);
818 return 0; 818 return 0;