diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-06-25 06:09:32 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-07-20 05:11:36 -0400 |
commit | e65365de5ba280e058bd6b8b80c8790253268887 (patch) | |
tree | 8ce89e16bd1519b620c52c407511c30f3af391f3 /sound/pci | |
parent | c12aad6efbee1d937438f1deabbef695add0628b (diff) |
[ALSA] Fix invalid schedule_timeout_interruptible()
Fixed the invalid use of schedule_timeout_interruptible() without
checking pending signals. Simply replaced with schedule_timeout().
Suggestions thanks to Jeff Garzik.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 | ||||
-rw-r--r-- | sound/pci/via82xx.c | 4 | ||||
-rw-r--r-- | sound/pci/via82xx_modem.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 74e5593a58e1..c78ff901a572 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -538,7 +538,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) | |||
538 | } | 538 | } |
539 | if (! chip->rirb.cmds) | 539 | if (! chip->rirb.cmds) |
540 | return chip->rirb.res; /* the last value */ | 540 | return chip->rirb.res; /* the last value */ |
541 | schedule_timeout_interruptible(1); | 541 | schedule_timeout(1); |
542 | } while (time_after_eq(timeout, jiffies)); | 542 | } while (time_after_eq(timeout, jiffies)); |
543 | 543 | ||
544 | if (chip->msi) { | 544 | if (chip->msi) { |
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 50c9f92cfd1b..6ea09df0c73a 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
@@ -2098,7 +2098,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip) | |||
2098 | pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); | 2098 | pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); |
2099 | if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */ | 2099 | if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */ |
2100 | break; | 2100 | break; |
2101 | schedule_timeout_uninterruptible(1); | 2101 | schedule_timeout(1); |
2102 | } while (time_before(jiffies, end_time)); | 2102 | } while (time_before(jiffies, end_time)); |
2103 | 2103 | ||
2104 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) | 2104 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) |
@@ -2117,7 +2117,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip) | |||
2117 | chip->ac97_secondary = 1; | 2117 | chip->ac97_secondary = 1; |
2118 | goto __ac97_ok2; | 2118 | goto __ac97_ok2; |
2119 | } | 2119 | } |
2120 | schedule_timeout_interruptible(1); | 2120 | schedule_timeout(1); |
2121 | } while (time_before(jiffies, end_time)); | 2121 | } while (time_before(jiffies, end_time)); |
2122 | /* This is ok, the most of motherboards have only one codec */ | 2122 | /* This is ok, the most of motherboards have only one codec */ |
2123 | 2123 | ||
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 8cbf8eba4ae9..72425e73abae 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -983,7 +983,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip) | |||
983 | pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); | 983 | pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval); |
984 | if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */ | 984 | if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */ |
985 | break; | 985 | break; |
986 | schedule_timeout_uninterruptible(1); | 986 | schedule_timeout(1); |
987 | } while (time_before(jiffies, end_time)); | 987 | } while (time_before(jiffies, end_time)); |
988 | 988 | ||
989 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) | 989 | if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY) |
@@ -1001,7 +1001,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip) | |||
1001 | chip->ac97_secondary = 1; | 1001 | chip->ac97_secondary = 1; |
1002 | goto __ac97_ok2; | 1002 | goto __ac97_ok2; |
1003 | } | 1003 | } |
1004 | schedule_timeout_interruptible(1); | 1004 | schedule_timeout(1); |
1005 | } while (time_before(jiffies, end_time)); | 1005 | } while (time_before(jiffies, end_time)); |
1006 | /* This is ok, the most of motherboards have only one codec */ | 1006 | /* This is ok, the most of motherboards have only one codec */ |
1007 | 1007 | ||