Commit 580171f7 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: propagate errors on ath_init_device() and request_irq() 



We've cleaned up ath_init_device() and its children enough
to pass meaninful errors back from probe. When this fails
it means our device could not be initialized and a meaninful
error will have been passed.

Do the same for request_irq() and also synchronize the error
messages while at it.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent db6be53c

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

+3 −5
Original line number Diff line number Diff line
@@ -120,16 +120,14 @@ static int ath_ahb_probe(struct platform_device *pdev) 
	sc->irq = irq;



	ret = ath_init_device(AR5416_AR9100_DEVID, sc);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);

		ret = -ENODEV;

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize device\n");

		goto err_free_hw;

	}



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

	if (ret) {

		dev_err(&pdev->dev, "request_irq failed, err=%d\n", ret);

		ret = -EIO;

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

		goto err_detach;

	}

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

+6 −6
Original line number Diff line number Diff line
@@ -179,17 +179,17 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	sc->mem = mem;

	sc->bus_ops = &ath_pci_bus_ops;



	if (ath_init_device(id->device, sc) != 0) {

		ret = -ENODEV;

	ret = ath_init_device(id->device, sc);

	if (ret) {

		dev_err(&pdev->dev, "failed to initialize device\n");

		goto bad3;

	}



	/* setup interrupt service routine */



	if (request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath", sc)) {

		printk(KERN_ERR "%s: request_irq failed\n",

			wiphy_name(hw->wiphy));

		ret = -EIO;

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

	if (ret) {

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

		goto bad4;

	}