From cca9f7c20b5d88f5f5424d43bd25fe8451c48c29 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Fri, 27 May 2011 08:40:29 -0700 Subject: [PATCH] --- yaml --- r: 255415 b: refs/heads/master c: 93cce6f0adff92238965eadb3c046db58552087b h: refs/heads/master i: 255413: 93e35821f47e8e3abb6faeb54fb09c0072f3ca24 255411: 64549d444e5cad1c31c5e2c42a7653a945bfd32b 255407: 324a18901d8df9ae17395c79e7f2cbbe689ffa39 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 474772a68409..6917842d1009 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e5d04dad1934d97057cbecce59834f78dafc067 +refs/heads/master: 93cce6f0adff92238965eadb3c046db58552087b diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 291ceb53c912..76b333624a2e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3615,8 +3615,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) destroy_workqueue(priv->workqueue); priv->workqueue = NULL; free_irq(priv->pci_dev->irq, priv); - iwl_free_isr_ict(priv); out_disable_msi: + iwl_free_isr_ict(priv); pci_disable_msi(priv->pci_dev); iwl_uninit_drv(priv); out_free_eeprom: