From a640a281f1e83a81aace2dfff08b18fe3d31dcee Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Thu, 29 Sep 2005 21:39:32 +0200 Subject: [PATCH] --- yaml --- r: 9499 b: refs/heads/master c: 03cdc0c304e1c068d49adc32264f07af76253e4c h: refs/heads/master i: 9497: 1adb9268ed6a9b6260520f1800070430406bc1e6 9495: 9dbc99cbf5137e3a2de9d8dd5f1493584627b938 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hcd-pci.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 10af7758fd36..58d870c32d8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1294b118cb53fb14515666e2b218ad5ab40318c1 +refs/heads/master: 03cdc0c304e1c068d49adc32264f07af76253e4c diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c index cbb451d227d2..6385d1a99b60 100644 --- a/trunk/drivers/usb/core/hcd-pci.c +++ b/trunk/drivers/usb/core/hcd-pci.c @@ -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); } @@ -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)) {