Return-path: Received: from mga11.intel.com ([192.55.52.93]:43895 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756633Ab1HFTp4 convert rfc822-to-8bit (ORCPT ); Sat, 6 Aug 2011 15:45:56 -0400 From: "Grumbach, Emmanuel" To: Emmanuel Grumbach , "Guy, Wey-Yi W" CC: Pavel Roskin , Daniel Halperin , "linville@tuxdriver.com" , "linux-wireless@vger.kernel.org" Date: Sat, 6 Aug 2011 22:45:50 +0300 Subject: RE: [PATCH wireless-3.1] iwlagn: sysfs couldn't find the priv pointer Message-ID: <4825B8A2C4E264489E57869F0DCFB22344564A2BB0@hasmsx502.ger.corp.intel.com> (sfid-20110806_214559_620901_5A995BB4) References: <1312228017-12061-1-git-send-email-wey-yi.w.guy@intel.com> <4825B8A2C4E264489E57869F0DCFB22344563F4ABE@hasmsx502.ger.corp.intel.com> <1312499702.15170.17.camel@wwguy-huron> <20110805225051.435fe1b0@mj> In-Reply-To: Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On top of my previous patch of course (which actually fixed the previous bug, but added the one you are facing now...). Thanks, Emmanuel > -----Original Message----- > From: Emmanuel Grumbach [mailto:egrumbach@gmail.com] > Sent: Saturday, August 06, 2011 10:44 PM > To: Guy, Wey-Yi W > Cc: Pavel Roskin; Grumbach, Emmanuel; Daniel Halperin; > linville@tuxdriver.com; linux-wireless@vger.kernel.org > Subject: Re: [PATCH wireless-3.1] iwlagn: sysfs couldn't find the priv > pointer > > Can you please try that one ? > I don't have my machine near me, and don't want to crash it remotely, so I > didn't test it. I will test in on Sunday. > > > diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c > b/drivers/net/wireless/iwlwifi/iwl-pci.c > index 69d4ec4..2fdbffa 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-pci.c > +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c > @@ -478,27 +478,22 @@ out_no_pci: > return err; > } > > -static void iwl_pci_down(struct iwl_bus *bus) -{ > - struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus- > >bus_specific; > - > - pci_disable_msi(pci_bus->pci_dev); > - pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base); > - pci_release_regions(pci_bus->pci_dev); > - pci_disable_device(pci_bus->pci_dev); > - pci_set_drvdata(pci_bus->pci_dev, NULL); > - > - kfree(bus); > -} > - > static void __devexit iwl_pci_remove(struct pci_dev *pdev) { > struct iwl_priv *priv = pci_get_drvdata(pdev); > - void *bus_specific = priv->bus->bus_specific; > + struct iwl_bus *bus = priv->bus; > + struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus); > + struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus); > > iwl_remove(priv); > > - iwl_pci_down(bus_specific); > + pci_disable_msi(pci_dev); > + pci_iounmap(pci_dev, pci_bus->hw_base); > + pci_release_regions(pci_dev); > + pci_disable_device(pci_dev); > + pci_set_drvdata(pci_dev, NULL); > + > + kfree(bus); > } > > #ifdef CONFIG_PM --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.