Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755570AbZDFBqR (ORCPT ); Sun, 5 Apr 2009 21:46:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752391AbZDFBqA (ORCPT ); Sun, 5 Apr 2009 21:46:00 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50516 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbZDFBp7 (ORCPT ); Sun, 5 Apr 2009 21:45:59 -0400 Date: Mon, 06 Apr 2009 03:45:57 +0200 Message-ID: From: Takashi Iwai To: stoyboyker@gmail.com Cc: linux-kernel@vger.kernel.org, perex@perex.cz Subject: Re: [PATCH 03/13] [oss] changed ioctls to unlocked In-Reply-To: <1237929168-15341-4-git-send-email-stoyboyker@gmail.com> References: <1237929168-15341-4-git-send-email-stoyboyker@gmail.com> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3780 Lines: 151 At Tue, 24 Mar 2009 16:12:38 -0500, stoyboyker@gmail.com wrote: > > From: Stoyan Gaydarov > > Signed-off-by: Stoyan Gaydarov The patch wasn't applied cleanly by some reason. Could you double-check with the latest git tree? (It might be a problem in my side, though, as I'm working remotely now during vacation :) thanks, Takashi > --- > sound/oss/sh_dac_audio.c | 60 ++++++++++++++++++++++++++++++--------------- > 1 files changed, 40 insertions(+), 20 deletions(-) > > diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c > index e5d4239..22ae271 100644 > --- a/sound/oss/sh_dac_audio.c > +++ b/sound/oss/sh_dac_audio.c > @@ -111,35 +111,43 @@ static void dac_audio_set_rate(void) > ctrl_outl(interval, TMU1_TCNT); > } > > -static int dac_audio_ioctl(struct inode *inode, struct file *file, > - unsigned int cmd, unsigned long arg) > +static long dac_audio_ioctl(struct file *file, unsigned int cmd, > + unsigned long arg) > { > int val; > + long ret; > > switch (cmd) { > case OSS_GETVERSION: > - return put_user(SOUND_VERSION, (int *)arg); > + ret = put_user(SOUND_VERSION, (int *)arg); > + break; > > case SNDCTL_DSP_SYNC: > dac_audio_sync(); > - return 0; > + ret = 0; > + break; > > case SNDCTL_DSP_RESET: > dac_audio_reset(); > - return 0; > + ret = 0; > + break; > > case SNDCTL_DSP_GETFMTS: > - return put_user(AFMT_U8, (int *)arg); > + ret = put_user(AFMT_U8, (int *)arg); > + break; > > case SNDCTL_DSP_SETFMT: > - return put_user(AFMT_U8, (int *)arg); > + ret = put_user(AFMT_U8, (int *)arg); > + break; > > case SNDCTL_DSP_NONBLOCK: > file->f_flags |= O_NONBLOCK; > - return 0; > + ret = 0; > + break; > > case SNDCTL_DSP_GETCAPS: > - return 0; > + ret = 0; > + break; > > case SOUND_PCM_WRITE_RATE: > val = *(int *)arg; > @@ -147,32 +155,44 @@ static int dac_audio_ioctl(struct inode *inode, struct file *file, > rate = val; > dac_audio_set_rate(); > } > - return put_user(rate, (int *)arg); > + ret = put_user(rate, (int *)arg); > + break; > > case SNDCTL_DSP_STEREO: > - return put_user(0, (int *)arg); > + ret = put_user(0, (int *)arg); > + break; > > case SOUND_PCM_WRITE_CHANNELS: > - return put_user(1, (int *)arg); > + ret = put_user(1, (int *)arg); > + break; > > case SNDCTL_DSP_SETDUPLEX: > - return -EINVAL; > + ret = -EINVAL; > + break; > > case SNDCTL_DSP_PROFILE: > - return -EINVAL; > + ret = -EINVAL; > + break; > > case SNDCTL_DSP_GETBLKSIZE: > - return put_user(BUFFER_SIZE, (int *)arg); > + ret = put_user(BUFFER_SIZE, (int *)arg); > + break; > > case SNDCTL_DSP_SETFRAGMENT: > - return 0; > + ret = 0; > + break; > > default: > printk(KERN_ERR "sh_dac_audio: unimplemented ioctl=0x%x\n", > cmd); > - return -EINVAL; > + ret = -EINVAL; > + break; > } > - return -EINVAL; > + if(!ret) > + ret = -EINVAL; > + > + unlock_kernel(); > + return ret; > } > > static ssize_t dac_audio_write(struct file *file, const char *buf, size_t count, > @@ -257,8 +277,8 @@ static int dac_audio_release(struct inode *inode, struct file *file) > > const struct file_operations dac_audio_fops = { > .read = dac_audio_read, > - .write = dac_audio_write, > - .ioctl = dac_audio_ioctl, > + .write = dac_audio_write, > + .unlocked_ioctl = dac_audio_ioctl, > .open = dac_audio_open, > .release = dac_audio_release, > }; > -- > 1.6.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/