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

From: Dmitriy Monakhov
Date: Mon Feb 26 2007 - 01:37:34 EST


Randy Dunlap <randy.dunlap@xxxxxxxxxx> writes:

> 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 <dmonakhov@xxxxxxxxxx>
>> ---
>> 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?
True. Thanks for correcting me here.
It is't realy necessary print err message because ata_pci_device_do_resume()
already done this. So just remove braces.


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

Signed-off-by: Monakhov Dmitriy <dmonakhov@xxxxxxxxxx>

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 31b636f..18ac665 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -639,7 +639,9 @@ 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");