Merge branch 'topic/misc' into for-linus

This commit is contained in:
Takashi Iwai 2009-03-24 00:35:50 +01:00
commit e0d2054fd3
60 changed files with 491 additions and 277 deletions

View file

@ -30,9 +30,6 @@
#include "usbusx2y.h"
#include "usX2Yhwdep.h"
int usX2Y_hwdep_pcm_new(struct snd_card *card);
static int snd_us428ctls_vm_fault(struct vm_area_struct *area,
struct vm_fault *vmf)
{

View file

@ -227,9 +227,9 @@ static void i_usX2Y_In04Int(struct urb *urb)
if (usX2Y->US04) {
if (0 == usX2Y->US04->submitted)
do
do {
err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC);
while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
} while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
} else
if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) {
if (us428ctls->p4outLast != us428ctls->p4outSent) {

View file

@ -18,3 +18,5 @@ struct snd_usX2Y_hwdep_pcm_shm {
volatile unsigned captured_iso_frames;
int capture_iso_start;
};
int usX2Y_hwdep_pcm_new(struct snd_card *card);