From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomoya MORINAGA Subject: [PATCH 2/3] spi_topcliff_pch: change calling function order correctly in remove Date: Mon, 27 Dec 2010 20:23:46 +0900 Message-ID: <1293449027-3219-2-git-send-email-tomoya-linux@dsn.okisemi.com> References: <1293449027-3219-1-git-send-email-tomoya-linux@dsn.okisemi.com> Cc: qi.wang@intel.com, yong.y.wang@intel.com, joel.clark@intel.com, kok.howg.ewe@intel.com, Tomoya MORINAGA To: David Brownell , Grant Likely , spi-devel-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1293449027-3219-1-git-send-email-tomoya-linux@dsn.okisemi.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org Signed-off-by: Tomoya MORINAGA --- drivers/spi/spi_topcliff_pch.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi_topcliff_pch.c b/drivers/spi/spi_topcliff_pch.c index 18e077b..a796eaf 100644 --- a/drivers/spi/spi_topcliff_pch.c +++ b/drivers/spi/spi_topcliff_pch.c @@ -1166,21 +1166,21 @@ static void pch_spi_remove(struct pci_dev *pdev) spin_unlock(&board_dat->data[i]->lock); } - /* Free resources allocated for PCH SPI */ - pch_spi_free_resources(board_dat); - /* Unregister SPI master */ for (i = 0; i < board_dat->num; i++) spi_unregister_master(board_dat->data[i]->master); - /* free memory for private data */ - kfree(board_dat); + /* Free resources allocated for PCH SPI */ + pch_spi_free_resources(board_dat); pci_set_drvdata(pdev, NULL); /* disable PCI device */ pci_disable_device(pdev); + /* free memory for private data */ + kfree(board_dat); + dev_dbg(&pdev->dev, "%s invoked pci_disable_device\n", __func__); } -- 1.6.0.6