Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64840
b: refs/heads/master
c: 58e47bb
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Sep 11, 2007
1 parent a95a26c commit aa8e242
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 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: 6c28c1f59dce3325d373f44766e23eb4237a74c8
refs/heads/master: 58e47bb1767aa89bfa9cf7ecf4bc051886ae22b3
15 changes: 11 additions & 4 deletions trunk/drivers/ide/pci/via82cxxx.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Version 3.46
* Version 3.47
*
* VIA IDE driver for Linux. Supported southbridges:
*
Expand Down Expand Up @@ -430,19 +430,26 @@ static struct dmi_system_id cable_dmi_table[] = {
{ }
};

static int via_cable_override(void)
static int via_cable_override(struct pci_dev *pdev)
{
/* Systems by DMI */
if (dmi_check_system(cable_dmi_table))
return 1;

/* Arima W730-K8/Targa Visionary 811/... */
if (pdev->subsystem_vendor == 0x161F &&
pdev->subsystem_device == 0x2032)
return 1;

return 0;
}

static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
{
struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
struct pci_dev *pdev = hwif->pci_dev;
struct via82cxxx_dev *vdev = pci_get_drvdata(pdev);

if (via_cable_override())
if (via_cable_override(pdev))
return ATA_CBL_PATA40_SHORT;

if ((vdev->via_80w >> hwif->channel) & 1)
Expand Down

0 comments on commit aa8e242

Please sign in to comment.