From 560823bd6c508b30a369f1210ac6d49836aa9421 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Wed, 13 Dec 2006 00:35:53 -0800 Subject: [PATCH] --- yaml --- r: 44522 b: refs/heads/master c: f13c152684a7f99ead26525270ed3e28a1d2467f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/hpt366.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7f296ec82b99..7416c81d0d1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26c068daf089aa21844236c97d05049b9497cc0a +refs/heads/master: f13c152684a7f99ead26525270ed3e28a1d2467f diff --git a/trunk/drivers/ide/pci/hpt366.c b/trunk/drivers/ide/pci/hpt366.c index 9fd50801d382..08119da06d54 100644 --- a/trunk/drivers/ide/pci/hpt366.c +++ b/trunk/drivers/ide/pci/hpt366.c @@ -1035,14 +1035,14 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif) * First try reading the register in which the HighPoint BIOS * saves f_CNT value before reprogramming the DPLL from its * default setting (which differs for the various chips). + * NOTE: This register is only accessible via I/O space. + * * In case the signature check fails, we'll have to resort to * reading the f_CNT register itself in hopes that nobody has * touched the DPLL yet... */ - pci_read_config_dword(dev, 0x70, &temp); + temp = inl(pci_resource_start(dev, 4) + 0x90); if ((temp & 0xFFFFF000) != 0xABCDE000) { - int i; - printk(KERN_WARNING "HPT37X: no clock data saved by BIOS\n"); /* Calculate the average value of f_CNT */