Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / 0022-Staging-SLICOSS-Call-pci_release_regions-at-driver.patch

From f25fda728dfb5c23d1147279fc6a537451603369 Mon Sep 17 00:00:00 2001
From: Lior Dotan <liodot@gmail.com>
Date: Wed, 8 Oct 2008 11:37:37 +0200
Subject: [PATCH 22/23] Staging: SLICOSS: Call pci_release_regions at driver exit
Patch-mainline: 2.6.28

slic_entry_probe() calls pci_request_regions() but there's no matching
pci_release_regions() at driver's exit or if slic_entry_probe() fails.

Signed-off-by: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/slicoss/slicoss.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index c129e83..b61ac4b 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -520,6 +520,7 @@ err_out_free_mmio_region:
 	release_mem_region(mmio_start, mmio_len);
 
 err_out_exit_slic_probe:
+	pci_release_regions(pcidev);
 	DBG_ERROR("%s EXIT jiffies[%lx] cpu %d\n", __func__, jiffies,
 		  smp_processor_id());
 
@@ -649,6 +650,7 @@ static void __devexit slic_entry_remove(struct pci_dev *pcidev)
 	}
 	DBG_MSG("slicoss: %s deallocate device\n", __func__);
 	kfree(dev);
+	pci_release_regions(pcidev);
 	DBG_MSG("slicoss: %s EXIT\n", __func__);
 }
 
-- 
1.6.0.2