summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTejun Heo2006-12-26 11:39:50 +0100
committerJeff Garzik2007-02-09 23:39:30 +0100
commit553c4aa630af7bc885e056d0436e4eb7f238579b (patch)
tree5a6cf3b15e05309fcfbdb5f68471e2a20b235613 /include
parentlibata: use ata_id_c_string() (diff)
downloadkernel-qcow2-linux-553c4aa630af7bc885e056d0436e4eb7f238579b.tar.gz
kernel-qcow2-linux-553c4aa630af7bc885e056d0436e4eb7f238579b.tar.xz
kernel-qcow2-linux-553c4aa630af7bc885e056d0436e4eb7f238579b.zip
libata: handle pci_enable_device() failure while resuming
Handle pci_enable_device() failure while resuming. This patch kills the "ignoring return value of 'pci_enable_device'" warning message and propagates __must_check through ata_pci_device_do_resume(). Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index dab4dc505ce7..a8ecaaad55ff 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -716,7 +716,7 @@ extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_i
unsigned int n_ports);
extern void ata_pci_remove_one (struct pci_dev *pdev);
extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
-extern void ata_pci_device_do_resume(struct pci_dev *pdev);
+extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);
extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
extern int ata_pci_device_resume(struct pci_dev *pdev);
extern int ata_pci_clear_simplex(struct pci_dev *pdev);