2007-02-23 21:43:38

by Dmitry Monakhov

[permalink] [raw]
Subject: [PATCH] libata: handle ata_pci_device_do_resume() failure while resuming

Since commit:553c4aa630af7bc885e056d0436e4eb7f238579b
ata_pci_device_do_resume() can return error code, all callers was updated
except this one.

Signed-off-by: Monakhov Dmitriy <[email protected]>
---
drivers/ata/sata_inic162x.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 31b636f..7933043 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -639,7 +639,10 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
void __iomem *mmio_base = host->iomap[MMIO_BAR];
int rc;

- ata_pci_device_do_resume(pdev);
+ rc = ata_pci_device_do_resume(pdev);
+ if (rc) {
+ return rc;
+ }

if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
printk("XXX\n");
--
1.4.4.4



2007-02-26 06:05:07

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH] libata: handle ata_pci_device_do_resume() failure while resuming

On Sat, 24 Feb 2007 00:43:18 +0300 Dmitriy Monakhov wrote:

> Since commit:553c4aa630af7bc885e056d0436e4eb7f238579b
> ata_pci_device_do_resume() can return error code, all callers was updated
> except this one.
>
> Signed-off-by: Monakhov Dmitriy <[email protected]>
> ---
> drivers/ata/sata_inic162x.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
> index 31b636f..7933043 100644
> --- a/drivers/ata/sata_inic162x.c
> +++ b/drivers/ata/sata_inic162x.c
> @@ -639,7 +639,10 @@ static int inic_pci_device_resume(struct pci_dev *pdev)
> void __iomem *mmio_base = host->iomap[MMIO_BAR];
> int rc;
>
> - ata_pci_device_do_resume(pdev);
> + rc = ata_pci_device_do_resume(pdev);
> + if (rc) {
> + return rc;

Either (a) don't use the braces when they are not needed, or
(b) is it possible to add a meaningful message there, or is that
done elsewhere?

> + }
>
> if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
> printk("XXX\n");
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2007-02-26 06:36:54

by Dmitri Monakhov

[permalink] [raw]
Subject: [PATCH] libata: handle ata_pci_device_do_resume() failure while resuming (v2)

Attachments:
(No filename) (1.36 kB)
 diff-ms-libata-handle-ata_pci_device_do_resume-failure-while-resuming (490.00 B)
 Download all attachments