* [patch 06/30] libata: handle ata_pci_device_do_resume() failure while resuming
@ 2007-03-06 10:37 akpm
2007-03-06 11:57 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2007-03-06 10:37 UTC (permalink / raw)
To: jeff; +Cc: linux-ide, akpm, dmonakhov, dmonakhov
From: Dmitriy Monakhov <dmonakhov@sw.ru>
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/ata/sata_inic162x.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/ata/sata_inic162x.c~libata-handle-ata_pci_device_do_resume-failure-while-resuming-v2 drivers/ata/sata_inic162x.c
--- a/drivers/ata/sata_inic162x.c~libata-handle-ata_pci_device_do_resume-failure-while-resuming-v2
+++ a/drivers/ata/sata_inic162x.c
@@ -642,7 +642,9 @@ static int inic_pci_device_resume(struct
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) {
rc = init_controller(mmio_base, hpriv->cached_hctl);
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 06/30] libata: handle ata_pci_device_do_resume() failure while resuming
2007-03-06 10:37 [patch 06/30] libata: handle ata_pci_device_do_resume() failure while resuming akpm
@ 2007-03-06 11:57 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-03-06 11:57 UTC (permalink / raw)
To: akpm; +Cc: linux-ide, dmonakhov, dmonakhov
akpm@linux-foundation.org wrote:
> From: Dmitriy Monakhov <dmonakhov@sw.ru>
>
> 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>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> drivers/ata/sata_inic162x.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
applied to #upstream
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-06 11:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-06 10:37 [patch 06/30] libata: handle ata_pci_device_do_resume() failure while resuming akpm
2007-03-06 11:57 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).