patch-2.1.88 linux/drivers/sound/softoss.c

Next file: linux/drivers/sound/softoss.h
Previous file: linux/drivers/sound/sequencer.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.87/linux/drivers/sound/softoss.c linux/drivers/sound/softoss.c
@@ -762,7 +762,9 @@
 
 	case SNDCTL_SYNTH_INFO:
 		softsyn_info.nr_voices = devc->maxvoice;
-		return __copy_to_user(arg, &softsyn_info, sizeof(softsyn_info));
+		if (__copy_to_user(arg, &softsyn_info, sizeof(softsyn_info)))
+			return -EFAULT;
+		return 0;
 
 	case SNDCTL_SEQ_RESETSAMPLES:
 		stop_engine(devc);
@@ -992,8 +994,8 @@
 		return 0;
 
 	softsynth_disabled = 0;
-	devc->finfo.mode = OPEN_WRITE;
-	devc->finfo.flags = 0;
+	devc->finfo.f_mode = FMODE_WRITE;
+	devc->finfo.f_flags = 0;
 
 	if (softoss_dev >= num_audiodevs)
 		softoss_dev = num_audiodevs - 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov