Code Review
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ALSA] sound/pci: fix-up sleeping paths
[linux-2.6.git]
/
sound
/
pci
/
ali5451
/
ali5451.c
diff --git
a/sound/pci/ali5451/ali5451.c
b/sound/pci/ali5451/ali5451.c
index eb5c36d31a52ae75a7e802407b71d7f760529796..f08ae71f902da108b4312e75e759a6f672c48ef3 100644
(file)
--- a/
sound/pci/ali5451/ali5451.c
+++ b/
sound/pci/ali5451/ali5451.c
@@
-399,7
+399,7
@@
static int snd_ali_codec_ready( ali_t *codec,
unsigned long end_time;
unsigned int res;
unsigned long end_time;
unsigned int res;
- end_time = jiffies + 10 *
(HZ >> 2
);
+ end_time = jiffies + 10 *
msecs_to_jiffies(250
);
do {
res = snd_ali_5451_peek(codec,port);
if (! (res & 0x8000))
do {
res = snd_ali_5451_peek(codec,port);
if (! (res & 0x8000))
@@
-422,7
+422,7
@@
static int snd_ali_stimer_ready(ali_t *codec, int sched)
dwChk1 = snd_ali_5451_peek(codec, ALI_STIMER);
dwChk2 = snd_ali_5451_peek(codec, ALI_STIMER);
dwChk1 = snd_ali_5451_peek(codec, ALI_STIMER);
dwChk2 = snd_ali_5451_peek(codec, ALI_STIMER);
- end_time = jiffies + 10 *
(HZ >> 2
);
+ end_time = jiffies + 10 *
msecs_to_jiffies(250
);
do {
dwChk2 = snd_ali_5451_peek(codec, ALI_STIMER);
if (dwChk2 != dwChk1)
do {
dwChk2 = snd_ali_5451_peek(codec, ALI_STIMER);
if (dwChk2 != dwChk1)