Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26330
b: refs/heads/master
c: 8263c65
h: refs/heads/master
v: v3
  • Loading branch information
Bastiaan Jacques authored and Jaroslav Kysela committed Apr 27, 2006
1 parent 3966f56 commit bb838fa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5732e7a2cece461252bfcf2653bb09ab88ba36c5
refs/heads/master: 8263c65fbee1347b2ab1d8c9380946808d09f579
14 changes: 12 additions & 2 deletions trunk/sound/pci/via82xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ module_param(enable, bool, 0444);
#define VIA_REV_8233A 0x40 /* 1 rec, 1 multi-pb, spdf */
#define VIA_REV_8235 0x50 /* 2 rec, 4 pb, 1 multi-pb, spdif */
#define VIA_REV_8237 0x60
#define VIA_REV_8251 0x70

/*
* Direct registers
Expand Down Expand Up @@ -863,8 +864,15 @@ static snd_pcm_uframes_t snd_via8233_pcm_pointer(struct snd_pcm_substream *subst
status = inb(VIADEV_REG(viadev, OFFSET_STATUS));

if (!(status & VIA_REG_STAT_ACTIVE)) {
res = 0;
goto unlock;
/* An apparent bug in the 8251 is worked around by sending
* a REG_CTRL_START. */
if (chip->revision == VIA_REV_8251)
snd_via82xx_pcm_trigger(substream,
SNDRV_PCM_TRIGGER_START);
else {
res = 0;
goto unlock;
}
}
if (count & 0xffffff) {
idx = count >> 24;
Expand Down Expand Up @@ -2313,6 +2321,7 @@ static struct via823x_info via823x_cards[] __devinitdata = {
{ VIA_REV_8233A, "VIA 8233A", TYPE_VIA8233A },
{ VIA_REV_8235, "VIA 8235", TYPE_VIA8233 },
{ VIA_REV_8237, "VIA 8237", TYPE_VIA8233 },
{ VIA_REV_8251, "VIA 8251", TYPE_VIA8233 },
};

/*
Expand Down Expand Up @@ -2342,6 +2351,7 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
{ .subvendor = 0x1043, .subdevice = 0x810d, .action = VIA_DXS_SRC }, /* ASUS */
{ .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC }, /* ASUS A8V Deluxe */
{ .subvendor = 0x1043, .subdevice = 0x8174, .action = VIA_DXS_SRC }, /* ASUS */
{ .subvendor = 0x1043, .subdevice = 0x81b9, .action = VIA_DXS_SRC }, /* ASUS A8V-MX */
{ .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
{ .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */
{ .subvendor = 0x10cf, .subdevice = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
Expand Down

0 comments on commit bb838fa

Please sign in to comment.