Commit 74c4fa70 authored by Linus Torvalds's avatar Linus Torvalds

Fix sound driver timeout types. Again.

parent aa43a933
...@@ -1870,7 +1870,7 @@ static void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int mod ...@@ -1870,7 +1870,7 @@ static void snd_ac97_get_name(ac97_t *ac97, unsigned int id, char *name, int mod
*/ */
static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem) static int ac97_reset_wait(ac97_t *ac97, int timeout, int with_modem)
{ {
signed long end_time; unsigned long end_time;
end_time = jiffies + timeout; end_time = jiffies + timeout;
do { do {
unsigned short ext_mid; unsigned short ext_mid;
...@@ -1930,7 +1930,7 @@ int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97) ...@@ -1930,7 +1930,7 @@ int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97)
int err; int err;
ac97_t *ac97; ac97_t *ac97;
char name[64]; char name[64];
signed long end_time; unsigned long end_time;
static snd_device_ops_t ops = { static snd_device_ops_t ops = {
.dev_free = snd_ac97_dev_free, .dev_free = snd_ac97_dev_free,
}; };
...@@ -2083,7 +2083,7 @@ int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97) ...@@ -2083,7 +2083,7 @@ int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97)
*/ */
static int ac97_modem_reset_wait(ac97_t *ac97, int timeout) static int ac97_modem_reset_wait(ac97_t *ac97, int timeout)
{ {
signed long end_time; unsigned long end_time;
end_time = jiffies + timeout; end_time = jiffies + timeout;
do { do {
unsigned short ext_mid; unsigned short ext_mid;
......
...@@ -1778,7 +1778,7 @@ static void do_delay(intel8x0_t *chip) ...@@ -1778,7 +1778,7 @@ static void do_delay(intel8x0_t *chip)
static int snd_intel8x0_ich_chip_init(intel8x0_t *chip) static int snd_intel8x0_ich_chip_init(intel8x0_t *chip)
{ {
signed long end_time; unsigned long end_time;
unsigned int cnt, status, nstatus; unsigned int cnt, status, nstatus;
/* put logic to right state */ /* put logic to right state */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment