diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usx2y/usX2Yhwdep.c | 3 | ||||
-rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 4 | ||||
-rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index a26d8d83d3eb..4af8740db717 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c | |||
@@ -30,9 +30,6 @@ | |||
30 | #include "usbusx2y.h" | 30 | #include "usbusx2y.h" |
31 | #include "usX2Yhwdep.h" | 31 | #include "usX2Yhwdep.h" |
32 | 32 | ||
33 | int usX2Y_hwdep_pcm_new(struct snd_card *card); | ||
34 | |||
35 | |||
36 | static int snd_us428ctls_vm_fault(struct vm_area_struct *area, | 33 | static int snd_us428ctls_vm_fault(struct vm_area_struct *area, |
37 | struct vm_fault *vmf) | 34 | struct vm_fault *vmf) |
38 | { | 35 | { |
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index af8b84954054..5ce0da23ee96 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c | |||
@@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb) | |||
227 | 227 | ||
228 | if (usX2Y->US04) { | 228 | if (usX2Y->US04) { |
229 | if (0 == usX2Y->US04->submitted) | 229 | if (0 == usX2Y->US04->submitted) |
230 | do | 230 | do { |
231 | err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC); | 231 | err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC); |
232 | while (!err && usX2Y->US04->submitted < usX2Y->US04->len); | 232 | } while (!err && usX2Y->US04->submitted < usX2Y->US04->len); |
233 | } else | 233 | } else |
234 | if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) { | 234 | if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) { |
235 | if (us428ctls->p4outLast != us428ctls->p4outSent) { | 235 | if (us428ctls->p4outLast != us428ctls->p4outSent) { |
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.h b/sound/usb/usx2y/usx2yhwdeppcm.h index c3382fdc386b..9c4fb84b2aa0 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.h +++ b/sound/usb/usx2y/usx2yhwdeppcm.h | |||
@@ -18,3 +18,5 @@ struct snd_usX2Y_hwdep_pcm_shm { | |||
18 | volatile unsigned captured_iso_frames; | 18 | volatile unsigned captured_iso_frames; |
19 | int capture_iso_start; | 19 | int capture_iso_start; |
20 | }; | 20 | }; |
21 | |||
22 | int usX2Y_hwdep_pcm_new(struct snd_card *card); | ||