patch-2.1.83 linux/drivers/sound/dmabuf.c

Next file: linux/drivers/sound/local.h.master
Previous file: linux/drivers/net/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.82/linux/drivers/sound/dmabuf.c linux/drivers/sound/dmabuf.c
@@ -117,35 +117,32 @@
 static unsigned int default_set_bits(int dev, unsigned int bits)
 {
 	mm_segment_t fs = get_fs();
-	unsigned int r;
 
 	set_fs(get_ds());
-	r = audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (caddr_t)&bits);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (caddr_t)&bits);
 	set_fs(fs);
-	return r;
+	return bits;
 }
 
 static int default_set_speed(int dev, int speed)
 {
 	mm_segment_t fs = get_fs();
-	int r;
 
 	set_fs(get_ds());
-	r = audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (caddr_t)&speed);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (caddr_t)&speed);
 	set_fs(fs);
-	return r;
+	return speed;
 }
 
 static short default_set_channels(int dev, short channels)
 {
 	int c = channels;
 	mm_segment_t fs = get_fs();
-	short r;
 
 	set_fs(get_ds());
-	r = audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (caddr_t)&c);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (caddr_t)&c);
 	set_fs(fs);
-	return r;
+	return c;
 }
 
 static void check_driver(struct audio_driver *d)

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