aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 138286373850..1ac6c6475353 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3496,6 +3496,7 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
3496 priv->bus.priv = priv; 3496 priv->bus.priv = priv;
3497 priv->bus.bus_specific = bus_specific; 3497 priv->bus.bus_specific = bus_specific;
3498 priv->bus.ops = bus_ops; 3498 priv->bus.ops = bus_ops;
3499 priv->bus.irq = priv->bus.ops->get_irq(&priv->bus);
3499 priv->bus.ops->set_drv_data(&priv->bus, priv); 3500 priv->bus.ops->set_drv_data(&priv->bus, priv);
3500 priv->bus.dev = priv->bus.ops->get_dev(&priv->bus); 3501 priv->bus.dev = priv->bus.ops->get_dev(&priv->bus);
3501 3502
@@ -3603,11 +3604,10 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
3603 ********************/ 3604 ********************/
3604 iwl_alloc_isr_ict(priv); 3605 iwl_alloc_isr_ict(priv);
3605 3606
3606 err = request_irq(priv->bus.ops->get_irq(&priv->bus), iwl_isr_ict, 3607 err = request_irq(priv->bus.irq, iwl_isr_ict, IRQF_SHARED,
3607 IRQF_SHARED, DRV_NAME, priv); 3608 DRV_NAME, priv);
3608 if (err) { 3609 if (err) {
3609 IWL_ERR(priv, "Error allocating IRQ %d\n", 3610 IWL_ERR(priv, "Error allocating IRQ %d\n", priv->bus.irq);
3610 priv->bus.ops->get_irq(&priv->bus));
3611 goto out_uninit_drv; 3611 goto out_uninit_drv;
3612 } 3612 }
3613 3613
@@ -3644,7 +3644,7 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
3644 out_destroy_workqueue: 3644 out_destroy_workqueue:
3645 destroy_workqueue(priv->workqueue); 3645 destroy_workqueue(priv->workqueue);
3646 priv->workqueue = NULL; 3646 priv->workqueue = NULL;
3647 free_irq(priv->bus.ops->get_irq(&priv->bus), priv); 3647 free_irq(priv->bus.irq, priv);
3648 iwl_free_isr_ict(priv); 3648 iwl_free_isr_ict(priv);
3649 out_uninit_drv: 3649 out_uninit_drv:
3650 iwl_uninit_drv(priv); 3650 iwl_uninit_drv(priv);
@@ -3716,7 +3716,7 @@ void __devexit iwl_remove(struct iwl_priv * priv)
3716 priv->workqueue = NULL; 3716 priv->workqueue = NULL;
3717 iwl_free_traffic_mem(priv); 3717 iwl_free_traffic_mem(priv);
3718 3718
3719 free_irq(priv->bus.ops->get_irq(&priv->bus), priv); 3719 free_irq(priv->bus.irq, priv);
3720 priv->bus.ops->set_drv_data(&priv->bus, NULL); 3720 priv->bus.ops->set_drv_data(&priv->bus, NULL);
3721 3721
3722 iwl_uninit_drv(priv); 3722 iwl_uninit_drv(priv);