Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 092ca5bd authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[POWERPC] Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos 



Commit 6d98bda7 changed the init order
for chrp_pci_fixup_vt8231_ata().

It can not work anymore because either the irq is not yet set to 14 or
pci_get_device() returns nothing.  At least the printk() in
chrp_pci_fixup_vt8231_ata() does not trigger anymore.
pata_via works again on Pegasos with the change below.

Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3ca6644e

arch/powerpc/platforms/chrp/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, 
 * mode as well. The same fixup must be done to the class-code property in

 * the IDE node /pci@80000000/ide@C,1

 */

static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)

static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)

{

	u8 progif;

	struct pci_dev *viaisa;
@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide) 


	pci_dev_put(viaisa);

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);