aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-08-03 04:50:20 -0400
committerTakashi Iwai <tiwai@suse.de>2013-08-06 04:51:11 -0400
commit95fec88332dbbe4344ffc1b564480402a89ee805 (patch)
treef69bbc181b400e870ecbf578c3dadc0031a6a2a4 /sound/usb
parentf34d0650133389c76e22e9f27e57b74ed9e2c042 (diff)
ALSA: usb-audio: do not initialize and check implicit_fb
Since implicit_fb is not changed, !implicit_fb will always be true - it is set only after these checks. Similarly, there's also no need to set it at the top of the function. Change the type of implicit_fb to bool (more appropriate). Signed-off-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/pcm.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index c31dbdc09178..bb2e0f52e92f 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -405,7 +405,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
405{ 405{
406 int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK; 406 int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK;
407 unsigned int ep, attr; 407 unsigned int ep, attr;
408 int implicit_fb = 0; 408 bool implicit_fb;
409 int err; 409 int err;
410 410
411 /* we need a sync pipe in async OUT or adaptive IN mode */ 411 /* we need a sync pipe in async OUT or adaptive IN mode */
@@ -432,8 +432,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
432 the audio fields in the endpoint descriptors */ 432 the audio fields in the endpoint descriptors */
433 if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC || 433 if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC ||
434 (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && 434 (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
435 get_endpoint(alts, 1)->bSynchAddress != 0 && 435 get_endpoint(alts, 1)->bSynchAddress != 0)) {
436 !implicit_fb)) {
437 snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. bmAttributes %02x, bLength %d, bSynchAddress %02x\n", 436 snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. bmAttributes %02x, bLength %d, bSynchAddress %02x\n",
438 dev->devnum, fmt->iface, fmt->altsetting, 437 dev->devnum, fmt->iface, fmt->altsetting,
439 get_endpoint(alts, 1)->bmAttributes, 438 get_endpoint(alts, 1)->bmAttributes,
@@ -442,8 +441,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
442 return -EINVAL; 441 return -EINVAL;
443 } 442 }
444 ep = get_endpoint(alts, 1)->bEndpointAddress; 443 ep = get_endpoint(alts, 1)->bEndpointAddress;
445 if (!implicit_fb && 444 if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
446 get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
447 ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) || 445 ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) ||
448 (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) { 446 (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) {
449 snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n", 447 snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n",