On Thu, 19 Apr 2012, Steven Rostedt wrote: > Rebuilt with mrproper, and confirming the patch was added. > > It still locked up. But, I looked at your patch and mine and realized > that mine applied with some "FUZZ". > > Mine: > > @@ -1723,6 +1723,8 @@ int pci_finish_runtime_suspend(struct pci_dev *dev) > pci_power_t target_state = pci_target_state(dev); > int error; > > + if (1) > + target_state = PCI_D0; > if (target_state == PCI_POWER_ERROR) > return -EIO; > > Yours: > > @@ -1713,6 +1713,8 @@ int pci_prepare_to_sleep(struct pci_dev > pci_power_t target_state = pci_target_state(dev); > int error; > > + if (1) > + target_state = PCI_D0; > if (target_state == PCI_POWER_ERROR) > return -EIO; > > Mine applied to pci_finish_runtime_suspend not pci_prepare_to_sleep :-p > I'm using 3.2.5. Whoops! That'll do it. The names say it all: one routine is used for runtime PM and the other is used for system sleep. The two functions are very similar, so naturally "patch" got confused. Alan Stern -- 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
