diff options
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_patch.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_patch.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c index 4df668eb32b4..42bae6f7e9a4 100644 --- a/sound/pci/emu10k1/emu10k1_patch.c +++ b/sound/pci/emu10k1/emu10k1_patch.c | |||
@@ -35,14 +35,15 @@ | |||
35 | * allocate a sample block and copy data from userspace | 35 | * allocate a sample block and copy data from userspace |
36 | */ | 36 | */ |
37 | int | 37 | int |
38 | snd_emu10k1_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, | 38 | snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp, |
39 | snd_util_memhdr_t *hdr, const void __user *data, long count) | 39 | struct snd_util_memhdr *hdr, |
40 | const void __user *data, long count) | ||
40 | { | 41 | { |
41 | int offset; | 42 | int offset; |
42 | int truesize, size, loopsize, blocksize; | 43 | int truesize, size, loopsize, blocksize; |
43 | int loopend, sampleend; | 44 | int loopend, sampleend; |
44 | unsigned int start_addr; | 45 | unsigned int start_addr; |
45 | emu10k1_t *emu; | 46 | struct snd_emu10k1 *emu; |
46 | 47 | ||
47 | emu = rec->hw; | 48 | emu = rec->hw; |
48 | snd_assert(sp != NULL, return -EINVAL); | 49 | snd_assert(sp != NULL, return -EINVAL); |
@@ -205,10 +206,10 @@ snd_emu10k1_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, | |||
205 | * free a sample block | 206 | * free a sample block |
206 | */ | 207 | */ |
207 | int | 208 | int |
208 | snd_emu10k1_sample_free(snd_emux_t *rec, snd_sf_sample_t *sp, | 209 | snd_emu10k1_sample_free(struct snd_emux *rec, struct snd_sf_sample *sp, |
209 | snd_util_memhdr_t *hdr) | 210 | struct snd_util_memhdr *hdr) |
210 | { | 211 | { |
211 | emu10k1_t *emu; | 212 | struct snd_emu10k1 *emu; |
212 | 213 | ||
213 | emu = rec->hw; | 214 | emu = rec->hw; |
214 | snd_assert(sp != NULL, return -EINVAL); | 215 | snd_assert(sp != NULL, return -EINVAL); |