Re: [PATCH v2] sound: usb: mixer: increase control transfer timeout

[Jassi Brar]

On Mon, Aug 29, 2011 at 6:30 PM, Felipe Balbi <balbi@xxxxxx> wrote:
> Hi,
>
> On Mon, Aug 29, 2011 at 06:07:30PM +0530, Jassi Brar wrote:
>> On Mon, Aug 29, 2011 at 6:01 PM, Felipe Balbi <balbi@xxxxxx> wrote:
>> > 100ms might not be enough for slower devices. Increasing
>> > timeout to 1000ms doesn't seem like overkill.
>> >
>> > Signed-off-by: Felipe Balbi <balbi@xxxxxx>
>> > ---
>> >
>> > Changes since v1:
>> > Â. Increase all 100ms timeout to 1000ms
>> >
>> > Âsound/usb/mixer.c    Â|  Â4 ++--
>> > Âsound/usb/mixer_quirks.c | Â 10 +++++-----
>> > Â2 files changed, 7 insertions(+), 7 deletions(-)
>> >
>> > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
>> > index cdd19d7..1c9d443 100644
>> > --- a/sound/usb/mixer.c
>> > +++ b/sound/usb/mixer.c
>> > @@ -296,7 +296,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
>> > Â Â Â Â Â Â Â Âif (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âvalidx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf, val_len, 100) >= val_len) {
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf, val_len, 1000) >= val_len) {
>> > Â Â Â Â Â Â Â Â Â Â Â Â*value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
>> > Â Â Â Â Â Â Â Â Â Â Â Âsnd_usb_autosuspend(cval->mixer->chip);
>> > Â Â Â Â Â Â Â Â Â Â Â Âreturn 0;
>> > @@ -445,7 +445,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_sndctrlpipe(chip->dev, 0), request,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âvalidx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf, val_len, 100) >= 0) {
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf, val_len, 1000) >= 0) {
>> > Â Â Â Â Â Â Â Â Â Â Â Âsnd_usb_autosuspend(chip);
>> > Â Â Â Â Â Â Â Â Â Â Â Âreturn 0;
>> > Â Â Â Â Â Â Â Â}
>> > diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
>> > index 3d0f487..7c41399 100644
>> > --- a/sound/usb/mixer_quirks.c
>> > +++ b/sound/usb/mixer_quirks.c
>> > @@ -190,18 +190,18 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
>> > Â Â Â Â Â Â Â Âerr = snd_usb_ctl_msg(mixer->chip->dev,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â !value, 0, NULL, 0, 100);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â !value, 0, NULL, 0, 1000);
>> > Â Â Â Â/* USB X-Fi S51 Pro */
>> > Â Â Â Âif (mixer->chip->usb_id == USB_ID(0x041e, 0x30df))
>> > Â Â Â Â Â Â Â Âerr = snd_usb_ctl_msg(mixer->chip->dev,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â !value, 0, NULL, 0, 100);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â !value, 0, NULL, 0, 1000);
>> > Â Â Â Âelse
>> > Â Â Â Â Â Â Â Âerr = snd_usb_ctl_msg(mixer->chip->dev,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â value, index + 2, NULL, 0, 100);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â value, index + 2, NULL, 0, 1000);
>> > Â Â Â Âif (err < 0)
>> > Â Â Â Â Â Â Â Âreturn err;
>> > Â Â Â Âmixer->audigy2nx_leds[index] = value;
>> > @@ -299,7 +299,7 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_rcvctrlpipe(mixer->chip->dev, 0),
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUAC_GET_MEM, USB_DIR_IN | USB_TYPE_CLASS |
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_RECIP_INTERFACE, 0,
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â jacks[i].unitid << 8, buf, 3, 100);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â jacks[i].unitid << 8, buf, 3, 1000);
>> > Â Â Â Â Â Â Â Âif (err == 3 && (buf[0] == 3 || buf[0] == 6))
>> > Â Â Â Â Â Â Â Â Â Â Â Âsnd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]);
>> > Â Â Â Â Â Â Â Âelse
>> > @@ -332,7 +332,7 @@ static int snd_xonar_u1_switch_put(struct snd_kcontrol *kcontrol,
>> > Â Â Â Âerr = snd_usb_ctl_msg(mixer->chip->dev,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âusb_sndctrlpipe(mixer->chip->dev, 0), 0x08,
>> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂUSB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
>> > - Â Â Â Â Â Â Â Â Â Â Â Â Â Â 50, 0, &new_status, 1, 100);
>> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â 50, 0, &new_status, 1, 1000);
>>
>> How about also converting to use a local define for timeout value ?
>
> should it be part of another patch ? The current code has no defines at
> all and $SUBJECT is just changing what's currently there to another
> value.

Can't speak for maintainers, but personally I'd prefer a single patch with two
points in changelog. The change is trivial enough.
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðÃnÆàþY&—