diff --git a/[refs] b/[refs]
index e043b64f1133..3308443374a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e98cb276819d4c4d6eeaf26ddf627ec8ec9d8f1e
+refs/heads/master: 87b554a04a0d12f8ff3612b6c2e163e29a34616a
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c
index 1429386a1c67..b92ce377b102 100644
--- a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c
@@ -861,6 +861,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
 				str_info->src = SST_DRV;
 				retval = copy_to_user(&str_param->stream_id,
 						&retval, sizeof(__u32));
+				if (retval)
+					retval = -EFAULT;
 			} else {
 				if (retval == -SST_ERR_INVALID_PARAMS)
 					retval = -EINVAL;
@@ -934,7 +936,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
 		retval = copy_to_user((struct snd_sst_vol *)arg,
 						&get_vol, sizeof(get_vol));
 		if (retval) {
-			retval = -EIO;
+			retval = -EFAULT;
 			break;
 		}
 		/*sst_print_get_vol_info(str_id, &get_vol);*/