X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fdmabuf.c;h=c601ea25ec48ccaf4a1b5e60e6a7f853642b6eec;hb=78a6196531f0fe10aae05a9bc4c2701df614ac3d;hp=73aa1903181559f99b817c1d09ed9de49751fdca;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c
index 73aa19031..c601ea25e 100644
--- a/sound/oss/dmabuf.c
+++ b/sound/oss/dmabuf.c
@@ -236,7 +236,7 @@ static unsigned int default_set_bits(int dev, unsigned int bits)
 	mm_segment_t fs = get_fs();
 
 	set_fs(get_ds());
-	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (caddr_t)&bits);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SETFMT, (void __user *)&bits);
 	set_fs(fs);
 	return bits;
 }
@@ -246,7 +246,7 @@ static int default_set_speed(int dev, int speed)
 	mm_segment_t fs = get_fs();
 
 	set_fs(get_ds());
-	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (caddr_t)&speed);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_SPEED, (void __user *)&speed);
 	set_fs(fs);
 	return speed;
 }
@@ -257,7 +257,7 @@ static short default_set_channels(int dev, short channels)
 	mm_segment_t fs = get_fs();
 
 	set_fs(get_ds());
-	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (caddr_t)&c);
+	audio_devs[dev]->d->ioctl(dev, SNDCTL_DSP_CHANNELS, (void __user *)&c);
 	set_fs(fs);
 	return c;
 }