diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index f5aadb001986..c9476c237c42 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -1384,8 +1384,8 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, | |||
1384 | channels = params_channels(hw_params); | 1384 | channels = params_channels(hw_params); |
1385 | fmt = find_format(subs, format, rate, channels); | 1385 | fmt = find_format(subs, format, rate, channels); |
1386 | if (! fmt) { | 1386 | if (! fmt) { |
1387 | snd_printd(KERN_DEBUG "cannot set format: format = %s, rate = %d, channels = %d\n", | 1387 | snd_printd(KERN_DEBUG "cannot set format: format = 0x%x, rate = %d, channels = %d\n", |
1388 | snd_pcm_format_name(format), rate, channels); | 1388 | format, rate, channels); |
1389 | return -EINVAL; | 1389 | return -EINVAL; |
1390 | } | 1390 | } |
1391 | 1391 | ||
@@ -2011,6 +2011,8 @@ static struct usb_driver usb_audio_driver = { | |||
2011 | }; | 2011 | }; |
2012 | 2012 | ||
2013 | 2013 | ||
2014 | #if defined(CONFIG_PROCFS) && defined(CONFIG_SND_VERBOSE_PROCFS) | ||
2015 | |||
2014 | /* | 2016 | /* |
2015 | * proc interface for list the supported pcm formats | 2017 | * proc interface for list the supported pcm formats |
2016 | */ | 2018 | */ |
@@ -2101,6 +2103,13 @@ static void proc_pcm_format_add(struct snd_usb_stream *stream) | |||
2101 | snd_info_set_text_ops(entry, stream, 1024, proc_pcm_format_read); | 2103 | snd_info_set_text_ops(entry, stream, 1024, proc_pcm_format_read); |
2102 | } | 2104 | } |
2103 | 2105 | ||
2106 | #else | ||
2107 | |||
2108 | static inline void proc_pcm_format_add(struct snd_usb_stream *stream) | ||
2109 | { | ||
2110 | } | ||
2111 | |||
2112 | #endif | ||
2104 | 2113 | ||
2105 | /* | 2114 | /* |
2106 | * initialize the substream instance. | 2115 | * initialize the substream instance. |