summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-07-09 15:08:44 +0200
committerTakashi Iwai <tiwai@suse.de>2010-07-09 15:08:44 +0200
commitdcda6ad6dda4d486b00d66dd61387b102f4a9f6a (patch)
treedce774929c386836104ffde76e42c828445b783e /sound
parentec7b01d441fc26fde4de1045745efae43b477425 (diff)
parentd32d552e665dc07384208108165592d0b524dba2 (diff)
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/clock.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
index 66bd1574d80b..b853f8df794f 100644
--- a/sound/usb/clock.c
+++ b/sound/usb/clock.c
@@ -204,11 +204,8 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
ep = get_endpoint(alts, 0)->bEndpointAddress;
/* if endpoint doesn't have sampling rate control, bail out */
- if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE)) {
- snd_printk(KERN_WARNING "%d:%d:%d: endpoint lacks sample rate attribute bit, cannot set.\n",
- dev->devnum, iface, fmt->altsetting);
+ if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE))
return 0;
- }
data[0] = rate;
data[1] = rate >> 8;