diff options
| author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:48 -0500 |
| commit | c2c8bbadbf6532e48025c9065231244f0c477c29 (patch) | |
| tree | 06beee11c08b12912e0655088411d6bf79ad6ae5 /arch/ppc | |
| parent | b4d1ab58c016f4dffef4ff1eb392fa84e3c35024 (diff) | |
[PATCH] struct path: convert ppc
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/8xx_io/cs4218_tdm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c index 959d31c26cbb..c71ef3c2e7bf 100644 --- a/arch/ppc/8xx_io/cs4218_tdm.c +++ b/arch/ppc/8xx_io/cs4218_tdm.c | |||
| @@ -2165,7 +2165,7 @@ static int sq_release(struct inode *inode, struct file *file) | |||
| 2165 | int rc = 0; | 2165 | int rc = 0; |
| 2166 | 2166 | ||
| 2167 | if (sq.busy) | 2167 | if (sq.busy) |
| 2168 | rc = sq_fsync(file, file->f_dentry); | 2168 | rc = sq_fsync(file, file->f_path.dentry); |
| 2169 | sound.soft = sound.dsp; | 2169 | sound.soft = sound.dsp; |
| 2170 | sound.hard = sound.dsp; | 2170 | sound.hard = sound.dsp; |
| 2171 | sound_silence(); | 2171 | sound_silence(); |
| @@ -2218,25 +2218,25 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd, | |||
| 2218 | return 0; | 2218 | return 0; |
| 2219 | case SNDCTL_DSP_POST: | 2219 | case SNDCTL_DSP_POST: |
| 2220 | case SNDCTL_DSP_SYNC: | 2220 | case SNDCTL_DSP_SYNC: |
| 2221 | return sq_fsync(file, file->f_dentry); | 2221 | return sq_fsync(file, file->f_path.dentry); |
| 2222 | 2222 | ||
| 2223 | /* ++TeSche: before changing any of these it's | 2223 | /* ++TeSche: before changing any of these it's |
| 2224 | * probably wise to wait until sound playing has | 2224 | * probably wise to wait until sound playing has |
| 2225 | * settled down. */ | 2225 | * settled down. */ |
| 2226 | case SNDCTL_DSP_SPEED: | 2226 | case SNDCTL_DSP_SPEED: |
| 2227 | sq_fsync(file, file->f_dentry); | 2227 | sq_fsync(file, file->f_path.dentry); |
| 2228 | IOCTL_IN(arg, data); | 2228 | IOCTL_IN(arg, data); |
| 2229 | return IOCTL_OUT(arg, sound_set_speed(data)); | 2229 | return IOCTL_OUT(arg, sound_set_speed(data)); |
| 2230 | case SNDCTL_DSP_STEREO: | 2230 | case SNDCTL_DSP_STEREO: |
| 2231 | sq_fsync(file, file->f_dentry); | 2231 | sq_fsync(file, file->f_path.dentry); |
| 2232 | IOCTL_IN(arg, data); | 2232 | IOCTL_IN(arg, data); |
| 2233 | return IOCTL_OUT(arg, sound_set_stereo(data)); | 2233 | return IOCTL_OUT(arg, sound_set_stereo(data)); |
| 2234 | case SOUND_PCM_WRITE_CHANNELS: | 2234 | case SOUND_PCM_WRITE_CHANNELS: |
| 2235 | sq_fsync(file, file->f_dentry); | 2235 | sq_fsync(file, file->f_path.dentry); |
| 2236 | IOCTL_IN(arg, data); | 2236 | IOCTL_IN(arg, data); |
| 2237 | return IOCTL_OUT(arg, sound_set_stereo(data-1)+1); | 2237 | return IOCTL_OUT(arg, sound_set_stereo(data-1)+1); |
| 2238 | case SNDCTL_DSP_SETFMT: | 2238 | case SNDCTL_DSP_SETFMT: |
| 2239 | sq_fsync(file, file->f_dentry); | 2239 | sq_fsync(file, file->f_path.dentry); |
| 2240 | IOCTL_IN(arg, data); | 2240 | IOCTL_IN(arg, data); |
| 2241 | return IOCTL_OUT(arg, sound_set_format(data)); | 2241 | return IOCTL_OUT(arg, sound_set_format(data)); |
| 2242 | case SNDCTL_DSP_GETFMTS: | 2242 | case SNDCTL_DSP_GETFMTS: |
