Revision 2bf427b25b79eb7cea27963a66c3d4684cae0e0c authored by Bartlomiej Zolnierkiewicz on 30 June 2009, 02:20:42 UTC, committed by David S. Miller on 30 June 2009, 02:20:42 UTC
commit 2f0d0fd2a605666d38e290c5c0d2907484352dc4 ("ide-acpi: cleanup
do_drive_get_GTF()") didn't account for the lack of hwif->acpidata
check in generic_ide_suspend() [ indirect user of do_drive_get_GTF()
through ide_acpi_exec_tfs() ] resulting in broken resume when ACPI
support is enabled but ACPI data is unavailable.
Fix it by adding ide_port_acpi() helper for checking if port needs
ACPI handling and cleaning generic_ide_{suspend,resume}() to use it
instead of hiding hwif->acpidata and ide_noacpi checks in IDE ACPI
helpers (this should help in preventing similar bugs in the future).
While at it:
- kill superfluous debugging printks in ide_acpi_{get,push}_timing()
Reported-and-tested-by: Etienne Basset <etienne.basset@numericable.fr>
Also-reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 9c72ebe
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 22.5 KB |
| Makefile | -rw-r--r-- | 2.7 KB |
| i2c-acorn.c | -rw-r--r-- | 1.9 KB |
| i2c-ali1535.c | -rw-r--r-- | 15.8 KB |
| i2c-ali1563.c | -rw-r--r-- | 11.2 KB |
| i2c-ali15x3.c | -rw-r--r-- | 15.6 KB |
| i2c-amd756-s4882.c | -rw-r--r-- | 7.5 KB |
| i2c-amd756.c | -rw-r--r-- | 11.4 KB |
| i2c-amd8111.c | -rw-r--r-- | 11.1 KB |
| i2c-at91.c | -rw-r--r-- | 7.7 KB |
| i2c-au1550.c | -rw-r--r-- | 10.2 KB |
| i2c-bfin-twi.c | -rw-r--r-- | 19.4 KB |
| i2c-cpm.c | -rw-r--r-- | 17.8 KB |
| i2c-davinci.c | -rw-r--r-- | 16.0 KB |
| i2c-elektor.c | -rw-r--r-- | 8.8 KB |
| i2c-gpio.c | -rw-r--r-- | 5.3 KB |
| i2c-highlander.c | -rw-r--r-- | 11.1 KB |
| i2c-hydra.c | -rw-r--r-- | 4.3 KB |
| i2c-i801.c | -rw-r--r-- | 23.7 KB |
| i2c-ibm_iic.c | -rw-r--r-- | 19.6 KB |
| i2c-ibm_iic.h | -rw-r--r-- | 2.6 KB |
| i2c-imx.c | -rw-r--r-- | 17.1 KB |
| i2c-iop3xx.c | -rw-r--r-- | 12.9 KB |
| i2c-iop3xx.h | -rw-r--r-- | 4.1 KB |
| i2c-isch.c | -rw-r--r-- | 9.1 KB |
| i2c-ixp2000.c | -rw-r--r-- | 4.2 KB |
| i2c-mpc.c | -rw-r--r-- | 16.2 KB |
| i2c-mv64xxx.c | -rw-r--r-- | 16.6 KB |
| i2c-nforce2-s4985.c | -rw-r--r-- | 7.3 KB |
| i2c-nforce2.c | -rw-r--r-- | 13.1 KB |
| i2c-ocores.c | -rw-r--r-- | 8.5 KB |
| i2c-omap.c | -rw-r--r-- | 25.5 KB |
| i2c-parport-light.c | -rw-r--r-- | 6.0 KB |
| i2c-parport.c | -rw-r--r-- | 7.4 KB |
| i2c-parport.h | -rw-r--r-- | 3.0 KB |
| i2c-pasemi.c | -rw-r--r-- | 10.5 KB |
| i2c-pca-isa.c | -rw-r--r-- | 5.5 KB |
| i2c-pca-platform.c | -rw-r--r-- | 6.8 KB |
| i2c-piix4.c | -rw-r--r-- | 15.5 KB |
| i2c-pmcmsp.c | -rw-r--r-- | 17.6 KB |
| i2c-pnx.c | -rw-r--r-- | 18.8 KB |
| i2c-powermac.c | -rw-r--r-- | 8.5 KB |
| i2c-pxa.c | -rw-r--r-- | 27.0 KB |
| i2c-s3c2410.c | -rw-r--r-- | 22.1 KB |
| i2c-s6000.c | -rw-r--r-- | 11.0 KB |
| i2c-s6000.h | -rw-r--r-- | 2.3 KB |
| i2c-sh7760.c | -rw-r--r-- | 13.2 KB |
| i2c-sh_mobile.c | -rw-r--r-- | 17.8 KB |
| i2c-sibyte.c | -rw-r--r-- | 5.6 KB |
| i2c-simtec.c | -rw-r--r-- | 4.1 KB |
| i2c-sis5595.c | -rw-r--r-- | 11.6 KB |
| i2c-sis630.c | -rw-r--r-- | 13.5 KB |
| i2c-sis96x.c | -rw-r--r-- | 8.8 KB |
| i2c-stu300.c | -rw-r--r-- | 26.5 KB |
| i2c-stub.c | -rw-r--r-- | 4.8 KB |
| i2c-taos-evm.c | -rw-r--r-- | 8.0 KB |
| i2c-tiny-usb.c | -rw-r--r-- | 7.4 KB |
| i2c-versatile.c | -rw-r--r-- | 3.5 KB |
| i2c-via.c | -rw-r--r-- | 4.4 KB |
| i2c-viapro.c | -rw-r--r-- | 14.2 KB |
| i2c-voodoo3.c | -rw-r--r-- | 6.1 KB |
| scx200_acb.c | -rw-r--r-- | 14.3 KB |
| scx200_i2c.c | -rw-r--r-- | 3.4 KB |
Computing file changes ...
