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
History
File Mode Size
Kconfig -rw-r--r-- 9.1 KB
Makefile -rw-r--r-- 1.8 KB
adb-iop.c -rw-r--r-- 6.2 KB
adb.c -rw-r--r-- 19.2 KB
adbhid.c -rw-r--r-- 34.8 KB
ans-lcd.c -rw-r--r-- 3.8 KB
ans-lcd.h -rw-r--r-- 206 bytes
apm_emu.c -rw-r--r-- 3.1 KB
mac_hid.c -rw-r--r-- 3.6 KB
macio-adb.c -rw-r--r-- 6.4 KB
macio_asic.c -rw-r--r-- 18.8 KB
macio_sysfs.c -rw-r--r-- 1.6 KB
mediabay.c -rw-r--r-- 21.6 KB
nvram.c -rw-r--r-- 2.5 KB
rack-meter.c -rw-r--r-- 15.4 KB
smu.c -rw-r--r-- 30.6 KB
therm_adt746x.c -rw-r--r-- 17.3 KB
therm_pm72.c -rw-r--r-- 61.9 KB
therm_pm72.h -rw-r--r-- 9.3 KB
therm_windtunnel.c -rw-r--r-- 12.0 KB
via-cuda.c -rw-r--r-- 15.6 KB
via-macii.c -rw-r--r-- 14.1 KB
via-maciisi.c -rw-r--r-- 15.4 KB
via-pmu-backlight.c -rw-r--r-- 4.4 KB
via-pmu-event.c -rw-r--r-- 2.1 KB
via-pmu-event.h -rw-r--r-- 177 bytes
via-pmu-led.c -rw-r--r-- 3.1 KB
via-pmu.c -rw-r--r-- 60.1 KB
via-pmu68k.c -rw-r--r-- 19.5 KB
windfarm.h -rw-r--r-- 3.7 KB
windfarm_core.c -rw-r--r-- 10.9 KB
windfarm_cpufreq_clamp.c -rw-r--r-- 2.4 KB
windfarm_lm75_sensor.c -rw-r--r-- 5.9 KB
windfarm_max6690_sensor.c -rw-r--r-- 4.7 KB
windfarm_pid.c -rw-r--r-- 3.7 KB
windfarm_pid.h -rw-r--r-- 2.7 KB
windfarm_pm112.c -rw-r--r-- 18.1 KB
windfarm_pm121.c -rw-r--r-- 24.8 KB
windfarm_pm81.c -rw-r--r-- 21.3 KB
windfarm_pm91.c -rw-r--r-- 18.3 KB
windfarm_smu_controls.c -rw-r--r-- 8.0 KB
windfarm_smu_sat.c -rw-r--r-- 9.2 KB
windfarm_smu_sensors.c -rw-r--r-- 11.3 KB

back to top