Skip to contentSkip to conversation

pata_sil680: compile fix

PATCH Applied Tejun Heo 3 participants 3 messages May 19, 2007 – May 22, 2007 libata

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 pata_sil680: compile fix

Recent mmio change broke compilation if PM is turned on. Fix it.

Signed-off-by Tejun Heo <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
---
 pata_sil680.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/pata_sil680.c +3 -1
index 557a37b..89f59d1 100644
@@ -431,7 +431,9 @@ use_ioports:
 #ifdef CONFIG_PM
 static int sil680_reinit_one(struct pci_dev *pdev)
 {
-	sil680_init_chip(pdev);
+	int try_mmio;
+
+	sil680_init_chip(pdev, &try_mmio);
 	return ata_pci_device_resume(pdev);
 }
 #endif
#1 lore raw
Quoted 4 lines · Tejun Heo

Recent mmio change broke compilation if PM is turned on. Fix it.

Signed-off-by Tejun Heo <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>

Oops.. sorry about that.

Cheers,
Ben.

Quoted 19 lines
---
 pata_sil680.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/pata_sil680.c +3 -1
index 557a37b..89f59d1 100644
@@ -431,7 +431,9 @@ use_ioports:
 #ifdef CONFIG_PM
 static int sil680_reinit_one(struct pci_dev *pdev)
 {
-	sil680_init_chip(pdev);
+	int try_mmio;
+
+	sil680_init_chip(pdev, &try_mmio);
 	return ata_pci_device_resume(pdev);
 }
 #endif