From ba700b87c27576bc5f3abf26b02854ee8d83bc9f Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Thu, 3 Dec 2009 20:32:10 +0100 Subject: [PATCH] --- yaml --- r: 172876 b: refs/heads/master c: 3915044468217d9c224b824c308e4d112666f58d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_hpt3x3.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b2aa8ba4a90f..e39b7dba635e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 940a68de56c1952c29d9f3c1a769a82b1bdd2b67 +refs/heads/master: 3915044468217d9c224b824c308e4d112666f58d diff --git a/trunk/drivers/ata/pata_hpt3x3.c b/trunk/drivers/ata/pata_hpt3x3.c index 7e310253b36b..c86c71639a95 100644 --- a/trunk/drivers/ata/pata_hpt3x3.c +++ b/trunk/drivers/ata/pata_hpt3x3.c @@ -255,8 +255,17 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) #ifdef CONFIG_PM static int hpt3x3_reinit_one(struct pci_dev *dev) { + struct ata_host *host = dev_get_drvdata(&dev->dev); + int rc; + + rc = ata_pci_device_do_resume(dev); + if (rc) + return rc; + hpt3x3_init_chipset(dev); - return ata_pci_device_resume(dev); + + ata_host_resume(host); + return 0; } #endif