Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / staging / line6 / toneport.c

diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
index f310578..b754f69 100644 (file)
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
@@ -207,9 +207,9 @@ static int snd_toneport_monitor_put(struct snd_kcontrol *kcontrol,
        line6pcm->volume_monitor = ucontrol->value.integer.value[0];
 
        if (line6pcm->volume_monitor > 0)
-               line6_pcm_start(line6pcm, MASK_PCM_MONITOR);
+               line6_pcm_acquire(line6pcm, LINE6_BITS_PCM_MONITOR);
        else
-               line6_pcm_stop(line6pcm, MASK_PCM_MONITOR);
+               line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);
 
        return 1;
 }
@@ -264,7 +264,7 @@ static void toneport_start_pcm(unsigned long arg)
 {
        struct usb_line6_toneport *toneport = (struct usb_line6_toneport *)arg;
        struct usb_line6 *line6 = &toneport->line6;
-       line6_pcm_start(line6->line6pcm, MASK_PCM_MONITOR);
+       line6_pcm_acquire(line6->line6pcm, LINE6_BITS_PCM_MONITOR);
 }
 
 /* control definition */
@@ -320,7 +320,9 @@ static void toneport_setup(struct usb_line6_toneport *toneport)
        /* initialize source select: */
        switch (usbdev->descriptor.idProduct) {
        case LINE6_DEVID_TONEPORT_UX1:
+       case LINE6_DEVID_TONEPORT_UX2:
        case LINE6_DEVID_PODSTUDIO_UX1:
+       case LINE6_DEVID_PODSTUDIO_UX2:
                toneport_send_cmd(usbdev,
                                  toneport_source_info[toneport->source].code,
                                  0x0000);
@@ -363,7 +365,9 @@ static int toneport_try_init(struct usb_interface *interface,
        /* register source select control: */
        switch (usbdev->descriptor.idProduct) {
        case LINE6_DEVID_TONEPORT_UX1:
+       case LINE6_DEVID_TONEPORT_UX2:
        case LINE6_DEVID_PODSTUDIO_UX1:
+       case LINE6_DEVID_PODSTUDIO_UX2:
                err =
                    snd_ctl_add(line6->card,
                                snd_ctl_new1(&toneport_control_source,
@@ -442,7 +446,7 @@ void line6_toneport_disconnect(struct usb_interface *interface)
                struct snd_line6_pcm *line6pcm = toneport->line6.line6pcm;
 
                if (line6pcm != NULL) {
-                       line6_pcm_stop(line6pcm, MASK_PCM_MONITOR);
+                       line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);
                        line6_pcm_disconnect(line6pcm);
                }
        }