leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: usb-audio: reverse condition logic in set_sync_endpoint

Browse Source 
Reverse logic on the conditions required to qualify for a sync endpoint
and remove one level of indendation.

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eldad Zack
2013-08-03 10:50:19 +02:00
committed by Takashi Iwai
parent a60945fd08
commit f34d065013
1 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/usb/pcm.c
View File

@@ -419,9 +419,13 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
if (err < 0) if (err < 0)
return err; return err;
if (((is_playback && attr == USB_ENDPOINT_SYNC_ASYNC) || if (altsd->bNumEndpoints < 2)
(!is_playback && attr == USB_ENDPOINT_SYNC_ADAPTIVE)) && return 0;
altsd->bNumEndpoints >= 2) {
if ((is_playback && attr != USB_ENDPOINT_SYNC_ASYNC) ||
(!is_playback && attr != USB_ENDPOINT_SYNC_ADAPTIVE))
return 0;
/* check sync-pipe endpoint */ /* check sync-pipe endpoint */
/* ... and check descriptor size before accessing bSynchAddress /* ... and check descriptor size before accessing bSynchAddress
because there is a version of the SB Audigy 2 NX firmware lacking because there is a version of the SB Audigy 2 NX firmware lacking
@@ -440,7 +444,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
ep = get_endpoint(alts, 1)->bEndpointAddress; ep = get_endpoint(alts, 1)->bEndpointAddress;
if (!implicit_fb && if (!implicit_fb &&
get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
(( is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) || ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) ||
(!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) { (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) {
snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n", snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n",
dev->devnum, fmt->iface, fmt->altsetting, dev->devnum, fmt->iface, fmt->altsetting,
@@ -460,7 +464,6 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
return -EINVAL; return -EINVAL;
subs->data_endpoint->sync_master = subs->sync_endpoint; subs->data_endpoint->sync_master = subs->sync_endpoint;
}
return 0; return 0;
} }