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-- | 8.2 KB |
| Kconfig.debug | -rw-r--r-- | 977 bytes |
| Makefile | -rw-r--r-- | 1.6 KB |
| allocpercpu.c | -rw-r--r-- | 4.1 KB |
| backing-dev.c | -rw-r--r-- | 7.6 KB |
| bootmem.c | -rw-r--r-- | 18.8 KB |
| bounce.c | -rw-r--r-- | 6.5 KB |
| debug-pagealloc.c | -rw-r--r-- | 2.5 KB |
| dmapool.c | -rw-r--r-- | 12.9 KB |
| fadvise.c | -rw-r--r-- | 3.3 KB |
| failslab.c | -rw-r--r-- | 1.3 KB |
| filemap.c | -rw-r--r-- | 66.4 KB |
| filemap_xip.c | -rw-r--r-- | 11.0 KB |
| fremap.c | -rw-r--r-- | 6.7 KB |
| highmem.c | -rw-r--r-- | 11.2 KB |
| hugetlb.c | -rw-r--r-- | 61.6 KB |
| init-mm.c | -rw-r--r-- | 538 bytes |
| internal.h | -rw-r--r-- | 7.3 KB |
| kmemcheck.c | -rw-r--r-- | 2.8 KB |
| kmemleak-test.c | -rw-r--r-- | 3.3 KB |
| kmemleak.c | -rw-r--r-- | 41.9 KB |
| maccess.c | -rw-r--r-- | 1.4 KB |
| madvise.c | -rw-r--r-- | 9.8 KB |
| memcontrol.c | -rw-r--r-- | 63.8 KB |
| memory.c | -rw-r--r-- | 90.9 KB |
| memory_hotplug.c | -rw-r--r-- | 20.9 KB |
| mempolicy.c | -rw-r--r-- | 60.6 KB |
| mempool.c | -rw-r--r-- | 9.0 KB |
| migrate.c | -rw-r--r-- | 25.8 KB |
| mincore.c | -rw-r--r-- | 5.7 KB |
| mlock.c | -rw-r--r-- | 16.0 KB |
| mm_init.c | -rw-r--r-- | 3.7 KB |
| mmap.c | -rw-r--r-- | 64.5 KB |
| mmu_notifier.c | -rw-r--r-- | 8.2 KB |
| mmzone.c | -rw-r--r-- | 1.8 KB |
| mprotect.c | -rw-r--r-- | 7.7 KB |
| mremap.c | -rw-r--r-- | 11.1 KB |
| msync.c | -rw-r--r-- | 2.4 KB |
| nommu.c | -rw-r--r-- | 45.9 KB |
| oom_kill.c | -rw-r--r-- | 16.1 KB |
| page-writeback.c | -rw-r--r-- | 39.9 KB |
| page_alloc.c | -rw-r--r-- | 134.8 KB |
| page_cgroup.c | -rw-r--r-- | 10.0 KB |
| page_io.c | -rw-r--r-- | 3.4 KB |
| page_isolation.c | -rw-r--r-- | 3.6 KB |
| pagewalk.c | -rw-r--r-- | 3.2 KB |
| pdflush.c | -rw-r--r-- | 7.0 KB |
| percpu.c | -rw-r--r-- | 36.2 KB |
| prio_tree.c | -rw-r--r-- | 6.3 KB |
| quicklist.c | -rw-r--r-- | 2.5 KB |
| readahead.c | -rw-r--r-- | 14.9 KB |
| rmap.c | -rw-r--r-- | 34.7 KB |
| shmem.c | -rw-r--r-- | 68.9 KB |
| shmem_acl.c | -rw-r--r-- | 4.6 KB |
| slab.c | -rw-r--r-- | 116.8 KB |
| slob.c | -rw-r--r-- | 17.1 KB |
| slub.c | -rw-r--r-- | 110.5 KB |
| sparse-vmemmap.c | -rw-r--r-- | 4.2 KB |
| sparse.c | -rw-r--r-- | 16.2 KB |
| swap.c | -rw-r--r-- | 12.9 KB |
| swap_state.c | -rw-r--r-- | 10.1 KB |
| swapfile.c | -rw-r--r-- | 55.4 KB |
| thrash.c | -rw-r--r-- | 2.0 KB |
| truncate.c | -rw-r--r-- | 12.8 KB |
| util.c | -rw-r--r-- | 6.5 KB |
| vmalloc.c | -rw-r--r-- | 46.4 KB |
| vmscan.c | -rw-r--r-- | 76.7 KB |
| vmstat.c | -rw-r--r-- | 22.0 KB |
Computing file changes ...
