From 04bd58e43b7875ebdff03b322468da50448a170a Mon Sep 17 00:00:00 2001
From: Wang Shaoyan <wangshaoyan.pt@taobao.com>
Date: Mon, 8 Aug 2011 19:10:26 +0800
Subject: [PATCH] --- yaml --- r: 262682 b: refs/heads/master c:
 8039290a91c5dc4414093c086987a5d7738fe2fd h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/sound/oss/pss.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 698d16759f89..987b12531f8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94094c8aaeded11f8b99734b9ebdaada20b5f24a
+refs/heads/master: 8039290a91c5dc4414093c086987a5d7738fe2fd
diff --git a/trunk/sound/oss/pss.c b/trunk/sound/oss/pss.c
index 9b800ce5100e..2fc0624024b5 100644
--- a/trunk/sound/oss/pss.c
+++ b/trunk/sound/oss/pss.c
@@ -673,7 +673,8 @@ static void configure_nonsound_components(void)
 
 	if (pss_cdrom_port == -1) {	/* If cdrom port enablation wasn't requested */
 		printk(KERN_INFO "PSS: CDROM port not enabled.\n");
-	} else if (check_region(pss_cdrom_port, 2)) {
+	} else if (!request_region(pss_cdrom_port, 2, "PSS CDROM")) {
+		pss_cdrom_port = -1;
 		printk(KERN_ERR "PSS: CDROM I/O port conflict.\n");
 	} else {
 		set_io_base(devc, CONF_CDROM, pss_cdrom_port);
@@ -1232,7 +1233,8 @@ static void __exit cleanup_pss(void)
 		if(pssmpu)
 			unload_pss_mpu(&cfg_mpu);
 		unload_pss(&cfg);
-	}
+	} else if (pss_cdrom_port != -1)
+		release_region(pss_cdrom_port, 2);
 
 	if(!pss_keep_settings)	/* Keep hardware settings if asked */
 	{