Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

4 files changed, 14 insertions, 12 deletions

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 4d2a6ae978f7..8a197fd3c57e 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -458,7 +458,7 @@ static int ad1848_set_recmask(ad1848_info * devc, int mask)
         return mask;
 }
 
-static void change_bits(ad1848_info * devc, unsigned char *regval,
+static void oss_change_bits(ad1848_info *devc, unsigned char *regval,
                         unsigned char *muteval, int dev, int chn, int newval)
 {
         unsigned char mask;
@@ -516,10 +516,10 @@ static void ad1848_mixer_set_channel(ad1848_info *devc, int dev, int value, int
 
         if (muteregoffs != regoffs) {
                 muteval = ad_read(devc, muteregoffs);
-                change_bits(devc, &val, &muteval, dev, channel, value);
+                oss_change_bits(devc, &val, &muteval, dev, channel, value);
         }
         else
-                change_bits(devc, &val, &val, dev, channel, value);
+                oss_change_bits(devc, &val, &val, dev, channel, value);
 
         spin_lock_irqsave(&devc->lock,flags);
         ad_write(devc, regoffs, val);
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c
index 8f7d175767a2..6f13ab4afc6b 100644
--- a/sound/oss/pas2_pcm.c
+++ b/sound/oss/pas2_pcm.c
@@ -63,13 +63,13 @@ static int pcm_set_speed(int arg)
 
         if (pcm_channels & 2)
         {
-                foo = ((CLOCK_TICK_RATE / 2) + (arg / 2)) / arg;
-                arg = ((CLOCK_TICK_RATE / 2) + (foo / 2)) / foo;
+                foo = ((PIT_TICK_RATE / 2) + (arg / 2)) / arg;
+                arg = ((PIT_TICK_RATE / 2) + (foo / 2)) / foo;
         }
         else
         {
-                foo = (CLOCK_TICK_RATE + (arg / 2)) / arg;
-                arg = (CLOCK_TICK_RATE + (foo / 2)) / foo;
+                foo = (PIT_TICK_RATE + (arg / 2)) / arg;
+                arg = (PIT_TICK_RATE + (foo / 2)) / foo;
         }
 
         pcm_speed = arg;
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 9b800ce5100e..2fc0624024b5 100644
--- a/sound/oss/pss.c
+++ b/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 */
         {
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index 2039d31b7e22..f8f3b7a66b73 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -232,7 +232,7 @@ static int detect_mixer(sb_devc * devc)
         return 1;
 }
 
-static void change_bits(sb_devc * devc, unsigned char *regval, int dev, int chn, int newval)
+static void oss_change_bits(sb_devc *devc, unsigned char *regval, int dev, int chn, int newval)
 {
         unsigned char mask;
         int shift;
@@ -284,7 +284,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
                 return -EINVAL;
 
         val = sb_getmixer(devc, regoffs);
-        change_bits(devc, &val, dev, LEFT_CHN, left);
+        oss_change_bits(devc, &val, dev, LEFT_CHN, left);
 
         if ((*devc->iomap)[dev][RIGHT_CHN].regno != regoffs)    /*
                                                                  * Change register
@@ -304,7 +304,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
                                                          * Read the new one
                                                          */
         }
-        change_bits(devc, &val, dev, RIGHT_CHN, right);
+        oss_change_bits(devc, &val, dev, RIGHT_CHN, right);
 
         sb_setmixer(devc, regoffs, val);