From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 25469 invoked from network); 17 Feb 2021 00:04:50 -0000 Received: from 1ess.inri.net (216.126.196.35) by inbox.vuxu.org with ESMTPUTF8; 17 Feb 2021 00:04:50 -0000 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Received: from mail-pj1-f52.google.com ([209.85.216.52]) by 1ess; Tue Feb 16 19:01:17 -0500 2021 Received: by mail-pj1-f52.google.com with SMTP id kr16so340214pjb.2 for <9front@9front.org>; Tue, 16 Feb 2021 16:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mforney-org.20150623.gappssmtp.com; s=20150623; h=message-id:to:from:date:subject; bh=iYTM/3crS3ZCuZkvq0/AeeItGITXSGw3306zo/aVBXE=; b=eeZvxLNYSVNXV6CAkDBogUAk7qFTDy8GBhrlJGUTaFwbHenI0FrShvCbaPwop57tTY 5I+mQ87g2UsMeWdjIUBTLv0w44f02mPhGxekQDN5DNBSDadcGiDgKkoY9rx5517BT+TF ow2i/wbwIJE6zrhYDSq1b00hwPfIdLLGZeXPxu1kP3cWtLhcf9guWG9lxIrV2s4tFBiM jGHjWwEvE0etvT2jIua3R/PKXgHFsnIF2VpeNh5hqiDjFRFPzZEVOPHqo1eWsN4jIEVi Ep7iRHae2pDPFNJ/RD+W6f2RkGy7r5rhjKnwLxdENUQEfPGfryM5sWB78lVp2SPUPXAn bzdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:to:from:date:subject; bh=iYTM/3crS3ZCuZkvq0/AeeItGITXSGw3306zo/aVBXE=; b=CkjzvGa5v0skA2ppIRTAuGnhU4y5PixNz6KnNI8Q7ymM0StkrjyG01EqfCD6JPe94Q 6bAAloitQTF4RFhfO9Ah8saDonQxvitbeX8VwoMzHRPgHg+qSbKnUQZL7YvltnYTJaXb URFLVJvCX+lfonpxqlTOTHh49Mo6p5V8Ju6nb0a3Ebo5g9anU94d4pJnT0EZbwTOsj2d gLJaI+C6smPlM1I+gPEnM/XfLCu4DqPIJMj80NECi2hWiKgaZ7HQvp9qqGt0cIzMT9DQ 6te+zaGwyghILbnz2OcZmmqfzw+25Uc2F9z9EBk67IH3K3i8LmeMtNAw2u2mo49nnwOr qu+Q== X-Gm-Message-State: AOAM533qJqljUcBdjJ7lPGYW3WFYYSzdecyQB8dwRmOE78Ky6RHB1yh2 O/2THosb4wm6R29BHXCTpnq6enjbwVynQInYiXU= X-Google-Smtp-Source: ABdhPJyf/MXF5DnskHp46sE4eSbdBk4hTfNjcKguGpqrN4E4ms1wP24qSXAgjTdy48AAfmarogJjkw== X-Received: by 2002:aa7:9987:0:b029:1d9:f115:6f3b with SMTP id k7-20020aa799870000b02901d9f1156f3bmr149262pfh.50.1613519736619; Tue, 16 Feb 2021 15:55:36 -0800 (PST) Return-Path: Received: from arrow.hsd1.ca.comcast.net (c-73-70-188-119.hsd1.ca.comcast.net. [73.70.188.119]) by smtp.gmail.com with ESMTPSA id e6sm24518pfd.5.2021.02.16.15.55.36 for <9front@9front.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Feb 2021 15:55:36 -0800 (PST) Message-ID: <2C3ED12F4D58C29EA86D2DE288EBDDFC@arrow.hsd1.ca.comcast.net> To: 9front@9front.org From: Michael Forney Date: Tue, 16 Feb 2021 23:51:37 +0000 List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: virtualized open-source session-aware interface-aware extension Subject: [9front] nusb/serial: fix pl2303 usbcmd error checks Reply-To: 9front@9front.org Precedence: bulk Archived-At: List-Archive: List-Post: Since 5862:dc783947692e, usbcmd with Rh2d returns the size of the data stage (excluding the setup packet), so adjust the expected return values accordingly. diff 903b37d82b46bee9050d911e81235c4d4d25e4e2 a93cbc303473d336ddd224ac6198bf4499a181b8 --- a/sys/src/cmd/nusb/serial/prolific.c Mon Feb 15 01:42:11 2021 +++ b/sys/src/cmd/nusb/serial/prolific.c Tue Feb 16 15:51:37 2021 @@ -281,7 +281,7 @@ dsprint(2, "serial: vendorwrite val: 0x%x idx:%d\n", val, index); res = usbcmd(ser->dev, Rh2d | Rvendor | Rdev, VendorWriteReq, val, index, nil, 0); - if(res != 8) fprint(2, "serial: vendorwrite failed with res=%d\n", res); + if(res != 0) fprint(2, "serial: vendorwrite failed with res=%d\n", res); return res; } @@ -373,7 +373,7 @@ dumpbuf(buf, sizeof buf); res = usbcmd(ser->dev, Rh2d | Rclass | Riface, SetLineReq, 0, 0, buf, sizeof buf); - if(res != 8+ParamReqSz){ + if(res != ParamReqSz){ fprint(2, "serial: plsetparam failed with res=%d\n", res); if(res >= 0) werrstr("plsetparam failed with res=%d", res); return -1;