Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9499
b: refs/heads/master
c: 03cdc0c
h: refs/heads/master
i:
  9497: 1adb926
  9495: 9dbc99c
v: v3
  • Loading branch information
Daniel Ritz authored and Linus Torvalds committed Sep 30, 2005
1 parent db2d0c2 commit a640a28
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1294b118cb53fb14515666e2b218ad5ab40318c1
refs/heads/master: 03cdc0c304e1c068d49adc32264f07af76253e4c
9 changes: 0 additions & 9 deletions trunk/drivers/usb/core/hcd-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message)
case HC_STATE_SUSPENDED:
/* no DMA or IRQs except when HC is active */
if (dev->current_state == PCI_D0) {
free_irq (hcd->irq, hcd);
pci_save_state (dev);
pci_disable_device (dev);
}
Expand Down Expand Up @@ -374,14 +373,6 @@ int usb_hcd_pci_resume (struct pci_dev *dev)

hcd->state = HC_STATE_RESUMING;
hcd->saw_irq = 0;
retval = request_irq (dev->irq, usb_hcd_irq, SA_SHIRQ,
hcd->irq_descr, hcd);
if (retval < 0) {
dev_err (hcd->self.controller,
"can't restore IRQ after resume!\n");
usb_hc_died (hcd);
return retval;
}

retval = hcd->driver->resume (hcd);
if (!HC_IS_RUNNING (hcd->state)) {
Expand Down

0 comments on commit a640a28

Please sign in to comment.