Sarah, These patches allow return-from-hibernate to work with the latest upstream tree at commit 8f710dd34a46500e135203816c71c3ec567c46fd However, while the restore from hibernate worked, patch 2/2 introduced the following call trace. With just 1/2 applied, the trace does not appear. firewire_ohci 0000:09:01.0: failed to read phy reg 4 CPU: 6 PID: 5314 Comm: kworker/u65:11 Tainted: GF W 3.10.0-rc1+ #12 Hardware name: Hewlett-Packard HP Z820 Workstation/158B, BIOS J63 v02.55 02/07/2013 Workqueue: events_unbound async_run_entry_fn 0000000000000067 ffff8801700d1be8 ffffffff815383ba ffff8801700d1c18 ffffffffa014955c 00000000fffcdc8c 0000000000000004 ffff8801a42d4000 0000000000000000 ffff8801700d1c48 ffffffffa01496a0 ffff8801a42d4628 Call Trace: [<ffffffff815383ba>] dump_stack+0x19/0x1f [<ffffffffa014955c>] read_phy_reg+0x8c/0xd0 [firewire_ohci] [<ffffffffa01496a0>] update_phy_reg+0x30/0x70 [firewire_ohci] [<ffffffffa014972d>] ohci_update_phy_reg+0x4d/0x80 [firewire_ohci] [<ffffffffa014c7ad>] ohci_enable+0x1dd/0x630 [firewire_ohci] [<ffffffffa014cc8b>] pci_resume+0x8b/0x190 [firewire_ohci] [<ffffffff812842c2>] pci_legacy_resume+0x42/0x70 [<ffffffff81284378>] pci_pm_restore+0x88/0xc0 [<ffffffff812842f0>] ? pci_legacy_resume+0x70/0x70 [<ffffffff8135aee9>] dpm_run_callback+0x39/0x70 [<ffffffff8135b21d>] device_resume+0xbd/0x1c0 [<ffffffff8135b341>] async_resume+0x21/0x50 [<ffffffff8106e239>] async_run_entry_fn+0x49/0x140 [<ffffffff81060623>] process_one_work+0x183/0x490 [<ffffffff810617b0>] worker_thread+0x120/0x3a0 [<ffffffff81061690>] ? manage_workers+0x160/0x160 [<ffffffff8106755e>] kthread+0xce/0xe0 [<ffffffff81067490>] ? kthread_freezable_should_stop+0x70/0x70 [<ffffffff8154405c>] ret_from_fork+0x7c/0xb0 [<ffffffff81067490>] ? kthread_freezable_should_stop+0x70/0x70 dpm_run_callback(): pci_pm_restore+0x0/0xc0 returns -16 PM: Device 0000:09:01.0 failed to restore async: error -16 usb 1-1: reset high-speed USB device number 2 using ehci-pci ata3: SATA link up 1.5 Gbps (SStatus 113 SControl 300) ata3.00: configured for UDMA/100 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
