Detailed messages in usbaudio.c
PATCH 1/1 Detailed messages in usbaudio.c
Attached are 3 patches which make the error messages in usbaudio.c more useful and also some code optimizations.
commit 191cf816a5a618a84cc3627c5f9f96355f5d22c4
Author: Andreas Bergmeier <[email protected]> Date: Sat Jan 24 12:17:01 2009 +0100
Print device number which did not support low speed audio streaming
sound/usb/usbaudio.c +1 -1
@@ -2929,7 +2929,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)continue ; }if (snd_usb_get_speed (dev) ==USB_SPEED_LOW ) { -snd_printk (KERN_ERR "low speed audio streaming not supported\n" ); +snd_printk (KERN_ERR "%d: low speed audio streaming not supported\n" , dev->devnum);continue ; }if (!parse_audio_endpoints (chip, j)) {
commit c6d62cbaf6d36b252768ef109b8d85a036e1d451
Author: Andreas Bergmeier <[email protected]> Date: Sat Jan 24 12:16:16 2009 +0100
Replaced 'return NULL' lines by break in snd_usb_find_desc so there is only one default error.
sound/usb/usbaudio.c +2 -2
@@ -2054,10 +2054,10 @@ void *snd_usb_find_desc(void *descstart, int desclen, void *after, u8 dtype) end = p + desclen;for (; p < end;) {if (p[0 ] <2 ) -return NULL ; +break ; next = p + p[0 ];if (next > end) -return NULL ; +break ;if (p[1 ] == dtype && (!after || (void *)p > after)) {return p; }
commit cd0180399253b17ece4fc1177457b21b8b70fe8f
Author: Andreas Bergmeier <[email protected]> Date: Sat Jan 24 12:22:13 2009 +0100
Add device and control number so it's apparent for which control this error is showing up.
sound/usb/usbaudio.c +2 -2
@@ -2867,12 +2867,12 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)/* find audiocontrol interface */ host_iface = &usb_ifnum_to_if (dev, ctrlif)->altsetting[0 ];if (!(p1 =snd_usb_find_csint_desc (host_iface->extra, host_iface->extralen,NULL ,HEADER ))) { -snd_printk (KERN_ERR "cannot find HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: cannot find HEADER\n" , dev->devnum, ctrlif);return -EINVAL ; }if (! p1[7 ] || p1[0 ] <8 + p1[7 ]) { -snd_printk (KERN_ERR "invalid HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: invalid HEADER\n" , dev->devnum, ctrlif);return -EINVAL ; }
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 1 line · LCID Fire
Attached are 3 patches which make the error messages in
usbaudio.cmore useful and also some code optimizations.
Attached are the patches done via format patch.
Quoted 1 line
From
cd0180399253b17ece4fc1177457b21b8b70fe8fMon Sep 17 00:00:00 2001
From: Andreas Bergmeier <[email protected]>
Date: Sat, 24 Jan 2009 12:22:13 +0100
Subject: [PATCH] Add device and control number so it's apparent for which control this error is showing up.
--- sound/usb/usbaudio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/usbaudio.c +2 -2
@@ -2867,12 +2867,12 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)/* find audiocontrol interface */ host_iface = &usb_ifnum_to_if (dev, ctrlif)->altsetting[0 ];if (!(p1 =snd_usb_find_csint_desc (host_iface->extra, host_iface->extralen,NULL ,HEADER ))) { -snd_printk (KERN_ERR "cannot find HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: cannot find HEADER\n" , dev->devnum, ctrlif);return -EINVAL ; }if (! p1[7 ] || p1[0 ] <8 + p1[7 ]) { -snd_printk (KERN_ERR "invalid HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: invalid HEADER\n" , dev->devnum, ctrlif);return -EINVAL ; }
Signature · 1 line
1.5.6.3
Quoted 1 line
From
191cf816a5a618a84cc3627c5f9f96355f5d22c4Mon Sep 17 00:00:00 2001
From: Andreas Bergmeier <[email protected]>
Date: Sat, 24 Jan 2009 12:17:01 +0100
Subject: [PATCH] Print device number which did not support low speed audio streaming
--- sound/usb/usbaudio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/usb/usbaudio.c +1 -1
@@ -2929,7 +2929,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)continue ; }if (snd_usb_get_speed (dev) ==USB_SPEED_LOW ) { -snd_printk (KERN_ERR "low speed audio streaming not supported\n" ); +snd_printk (KERN_ERR "%d: low speed audio streaming not supported\n" , dev->devnum);continue ; }if (!parse_audio_endpoints (chip, j)) {
Signature · 1 line
1.5.6.3
Quoted 1 line
From
c6d62cbaf6d36b252768ef109b8d85a036e1d451Mon Sep 17 00:00:00 2001
From: Andreas Bergmeier <[email protected]>
Date: Sat, 24 Jan 2009 12:16:16 +0100
Subject: [PATCH] Replaced 'return NULL' lines by break in snd_usb_find_desc so there is only one default error.
--- sound/usb/usbaudio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/usbaudio.c +2 -2
@@ -2054,10 +2054,10 @@ void *snd_usb_find_desc(void *descstart, int desclen, void *after, u8 dtype) end = p + desclen;for (; p < end;) {if (p[0 ] <2 ) -return NULL ; +break ; next = p + p[0 ];if (next > end) -return NULL ; +break ;if (p[1 ] == dtype && (!after || (void *)p > after)) {return p; }
Signature · 1 line
1.5.6.3
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Tue, 27 Jan 2009 14:54:16 +0100,
Quoted 5 lines · LCID Fire
Quoted 2 lines
From
cd0180399253b17ece4fc1177457b21b8b70fe8fMon Sep 17 00:00:00 2001From: Andreas Bergmeier <[email protected]>
Date: Sat, 24 Jan 2009 12:22:13 +0100
Subject: [PATCH] Add device and control number so it's apparent for which control this error is showing up.
Please use a shorter summary line.
The detailed description should follow in the changelog.
Quoted 11 lines
Signed-off-by Andreas Bergmeier <[email protected]>--- sound/usb/usbaudio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)sound/usb/usbaudio.c +0
-0
sound/usb/usbaudio.c static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) · line 2870
Quoted 5 lines
sound/usb/usbaudio.c +1
-1@@ -2867,12 +2867,12 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)/* find audiocontrol interface */ host_iface = &usb_ifnum_to_if (dev, ctrlif)->altsetting[0 ];if (!(p1 =snd_usb_find_csint_desc (host_iface->extra, host_iface->extralen,NULL ,HEADER ))) { -snd_printk (KERN_ERR "cannot find HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: cannot find HEADER\n" , dev->devnum, ctrlif);
Please fold a line appropriately if it exceeds 80 chars.
sound/usb/usbaudio.c static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) · line 2875
Quoted 6 lines
sound/usb/usbaudio.c +1
-1return -EINVAL ; }if (! p1[7 ] || p1[0 ] <8 + p1[7 ]) { -snd_printk (KERN_ERR "invalid HEADER\n" ); +snd_printk (KERN_ERR "%d:%u: invalid HEADER\n" , dev->devnum, ctrlif);
Ditto.
thanks,
Takashi
At Tue, 27 Jan 2009 14:54:16 +0100,
Quoted 5 lines · LCID Fire
Quoted 2 lines · LCID Fire
Attached are 3 patches which make the error messages in
usbaudio.cmore useful and also some code optimizations.Attached are the patches done via format patch.
At the next time, please post one patch per mail.
This will make easier to review and reply.
thanks,
Takashi