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

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

[Dmitriy Monakhov]

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@openvz.org>
---
 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

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

[Randy Dunlap]

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@openvz.org>
> ---
>  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 ***

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

[Dmitriy Monakhov]

[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]

Randy Dunlap <randy.dunlap@oracle.com> 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@openvz.org>
>> ---
>>  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@openvz.org>


[-- Attachment #2: diff-ms-libata-handle-ata_pci_device_do_resume-failure-while-resuming --]
[-- Type: text/plain, Size: 490 bytes --]

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");