1 files changed, 6 insertions, 6 deletions

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index c2db7e905f7d..e8b19876c420 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -186,7 +186,7 @@ static int _snd_pcm_hw_param_mask(struct snd_pcm_hw_params *params,
 {
         int changed;
         changed = snd_mask_refine(hw_param_mask(params, var), val);
-        if (changed) {
+        if (changed > 0) {
                 params->cmask |= 1 << var;
                 params->rmask |= 1 << var;
         }
@@ -233,7 +233,7 @@ static int _snd_pcm_hw_param_min(struct snd_pcm_hw_params *params,
                                                   val, open);
         else
                 return -EINVAL;
-        if (changed) {
+        if (changed > 0) {
                 params->cmask |= 1 << var;
                 params->rmask |= 1 << var;
         }
@@ -294,7 +294,7 @@ static int _snd_pcm_hw_param_max(struct snd_pcm_hw_params *params,
                                                   val, open);
         else
                 return -EINVAL;
-        if (changed) {
+        if (changed > 0) {
                 params->cmask |= 1 << var;
                 params->rmask |= 1 << var;
         }
@@ -499,7 +499,7 @@ static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
                 }
         } else
                 return -EINVAL;
-        if (changed) {
+        if (changed > 0) {
                 params->cmask |= 1 << var;
                 params->rmask |= 1 << var;
         }
@@ -539,7 +539,7 @@ static int _snd_pcm_hw_param_setinteger(struct snd_pcm_hw_params *params,
 {
         int changed;
         changed = snd_interval_setinteger(hw_param_interval(params, var));
-        if (changed) {
+        if (changed > 0) {
                 params->cmask |= 1 << var;
                 params->rmask |= 1 << var;
         }
@@ -842,7 +842,7 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream,
                 if (!(mutex_trylock(&runtime->oss.params_lock)))
                         return -EAGAIN;
         } else if (mutex_lock_interruptible(&runtime->oss.params_lock))
-                return -EINTR;
+                return -ERESTARTSYS;
         sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL);
         params = kmalloc(sizeof(*params), GFP_KERNEL);
         sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);