diff options
Diffstat (limited to 'sound/pci/hda/hda_controller.c')
| -rw-r--r-- | sound/pci/hda/hda_controller.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 248b90abb882..480bbddbd801 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c | |||
| @@ -1059,24 +1059,26 @@ static void azx_init_cmd_io(struct azx *chip) | |||
| 1059 | 1059 | ||
| 1060 | /* reset the corb hw read pointer */ | 1060 | /* reset the corb hw read pointer */ |
| 1061 | azx_writew(chip, CORBRP, ICH6_CORBRP_RST); | 1061 | azx_writew(chip, CORBRP, ICH6_CORBRP_RST); |
| 1062 | for (timeout = 1000; timeout > 0; timeout--) { | 1062 | if (!(chip->driver_caps & AZX_DCAPS_CORBRP_SELF_CLEAR)) { |
| 1063 | if ((azx_readw(chip, CORBRP) & ICH6_CORBRP_RST) == ICH6_CORBRP_RST) | 1063 | for (timeout = 1000; timeout > 0; timeout--) { |
| 1064 | break; | 1064 | if ((azx_readw(chip, CORBRP) & ICH6_CORBRP_RST) == ICH6_CORBRP_RST) |
| 1065 | udelay(1); | 1065 | break; |
| 1066 | } | 1066 | udelay(1); |
| 1067 | if (timeout <= 0) | 1067 | } |
| 1068 | dev_err(chip->card->dev, "CORB reset timeout#1, CORBRP = %d\n", | 1068 | if (timeout <= 0) |
| 1069 | azx_readw(chip, CORBRP)); | 1069 | dev_err(chip->card->dev, "CORB reset timeout#1, CORBRP = %d\n", |
| 1070 | azx_readw(chip, CORBRP)); | ||
| 1070 | 1071 | ||
| 1071 | azx_writew(chip, CORBRP, 0); | 1072 | azx_writew(chip, CORBRP, 0); |
| 1072 | for (timeout = 1000; timeout > 0; timeout--) { | 1073 | for (timeout = 1000; timeout > 0; timeout--) { |
| 1073 | if (azx_readw(chip, CORBRP) == 0) | 1074 | if (azx_readw(chip, CORBRP) == 0) |
| 1074 | break; | 1075 | break; |
| 1075 | udelay(1); | 1076 | udelay(1); |
| 1077 | } | ||
| 1078 | if (timeout <= 0) | ||
| 1079 | dev_err(chip->card->dev, "CORB reset timeout#2, CORBRP = %d\n", | ||
| 1080 | azx_readw(chip, CORBRP)); | ||
| 1076 | } | 1081 | } |
| 1077 | if (timeout <= 0) | ||
| 1078 | dev_err(chip->card->dev, "CORB reset timeout#2, CORBRP = %d\n", | ||
| 1079 | azx_readw(chip, CORBRP)); | ||
| 1080 | 1082 | ||
| 1081 | /* enable corb dma */ | 1083 | /* enable corb dma */ |
| 1082 | azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN); | 1084 | azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN); |