Commit 839e7306 authored Oct 12, 2011 by Mikulas Patocka Committed by David S. Miller Oct 13, 2011

IDE: Don't powerdown Compaq Triflex IDE device on suspend



Don't powerdown Compaq Triflex IDE device on suspend

This fixes APM suspend on Compaq Armada 7400.
APM BIOS doesn't suspend if IDE is powered down when suspending.
The Triflex controller is found only on old Compaq boards,
so this patch will hopefully have no side effects.

This patch fixes a suspend regression introduced in
feb22b7f ("ide: add proper PCI PM
support (v2)").

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
[bart: add commit's summary in parens]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent dc9c0bee

drivers/ide/triflex.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -113,12 +113,26 @@ static const struct pci_device_id triflex_pci_tbl[] = {
		};
		MODULE_DEVICE_TABLE(pci, triflex_pci_tbl);

		#ifdef CONFIG_PM
		static int triflex_ide_pci_suspend(struct pci_dev *dev, pm_message_t state)
		{
		/*
		* We must not disable or powerdown the device.
		* APM bios refuses to suspend if IDE is not accessible.
		*/
		pci_save_state(dev);
		return 0;
		}
		#else
		#define triflex_ide_pci_suspend NULL
		#endif

		static struct pci_driver triflex_pci_driver = {
		.name = "TRIFLEX_IDE",
		.id_table = triflex_pci_tbl,
		.probe = triflex_init_one,
		.remove = ide_pci_remove,
		.suspend = ide_pci_suspend,
		.suspend = triflex_ide_pci_suspend,
		.resume = ide_pci_resume,
		};

Admin message