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

Commit 5e4ea1f0 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Fix panic on driver load 



The device has to be marked as invalid before
registering the ISR. HW initialization takes place
after the ISR has been registered, and the invalid
flag is eventually cleared in the ->stop() callback.

Reported-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2f1f00fc

drivers/net/wireless/ath/ath9k/ahb.c

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	sc->mem = mem;

	sc->irq = irq;



	/* Will be cleared in ath9k_start() */

	sc->sc_flags |= SC_OP_INVALID;



	ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);

	if (ret) {

		dev_err(&pdev->dev, "request_irq failed\n");

drivers/net/wireless/ath/ath9k/init.c

+0 −2
Original line number Diff line number Diff line
@@ -534,8 +534,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	int ret = 0, i;

	int csz = 0;



	sc->sc_flags |= SC_OP_INVALID;



	ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL);

	if (!ah)

		return -ENOMEM;

drivers/net/wireless/ath/ath9k/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sc->dev = &pdev->dev;

	sc->mem = mem;



	/* Will be cleared in ath9k_start() */

	sc->sc_flags |= SC_OP_INVALID;



	ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);

	if (ret) {

		dev_err(&pdev->dev, "request_irq failed\n");