Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d0cd72f authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

ath5k: do not release irq across suspend/resume 



Paraphrasing Rafael J. Wysocki: "drivers should not release PCI IRQs
in suspend."  Doing so causes a warning during suspend/resume on some
platforms.

Cc: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88f6bfe1

drivers/net/wireless/ath/ath5k/base.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -674,7 +674,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state) 




	ath5k_led_off(sc);

	ath5k_led_off(sc);





	free_irq(pdev->irq, sc);

	pci_save_state(pdev);

	pci_save_state(pdev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, PCI_D3hot);

	pci_set_power_state(pdev, PCI_D3hot);
@@ -702,18 +701,8 @@ ath5k_pci_resume(struct pci_dev *pdev) 
	 */

	 */

	pci_write_config_byte(pdev, 0x41, 0);

	pci_write_config_byte(pdev, 0x41, 0);





	err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);

	if (err) {

		ATH5K_ERR(sc, "request_irq failed\n");

		goto err_no_irq;

	}



	ath5k_led_enable(sc);

	ath5k_led_enable(sc);

	return 0;

	return 0;



err_no_irq:

	pci_disable_device(pdev);

	return err;

}

}

#endif /* CONFIG_PM */

#endif /* CONFIG_PM */