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 25145 invoked from network); 2 Jan 2022 00:12:08 -0000 Received: from 4ess.inri.net (216.126.196.42) by inbox.vuxu.org with ESMTPUTF8; 2 Jan 2022 00:12:08 -0000 Received: from mail-pf1-f172.google.com ([209.85.210.172]) by 4ess; Sat Jan 1 19:02:31 -0500 2022 Received: by mail-pf1-f172.google.com with SMTP id 8so26430604pfo.4 for <9front@9front.org>; Sat, 01 Jan 2022 16:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mforney-org.20210112.gappssmtp.com; s=20210112; h=from:message-id:date:subject:to:mime-version :content-transfer-encoding; bh=ZefIi0C1QTurQBesLicxZd5+eMi4q/pZLujC1nSxRRo=; b=Z5ersxs+9Z1ClNqJCqbR4jGoayxcYXwHh28WPc5YyviCfG6YFF2D2LY1TRiNlotL2Z d6sknNeBgmt/qc7E9dIiR6FBP4k30E+FnpLNNfeYWEJ1RS9sR9CDC+mJHSGPjOtHpMX0 HHwq6rioMVLhrsiJ4WnhOUxfg9spndgWA7D68I7ADTY8h8c0MBVq3EpXiUQha/mXrmOd A5TkPdW/Kifl5n90C8eCsKLVREjpCV18bHKP+tADkaCkaissiGtdXTN+WnDng6fcustG Kcm1L1Xwx2pbd7Pg6cL+CNsTxM9vN1iXd3czz7l+cVU5F/EPl03BuBVECrBN4U8I+UaJ PoYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:date:subject:to:mime-version :content-transfer-encoding; bh=ZefIi0C1QTurQBesLicxZd5+eMi4q/pZLujC1nSxRRo=; b=x3bfo8JBWsSwRQOW0I48BJsE2YQJXg9JP0Amo4wuteTUBbPJiEzu72XvKIj7fon8B4 FbHNnqBjT3OP2Q6j2K6LhYbhhD/8AMZipACaYISIDcxC3R2U9hgip1V5zUg0gJ7PzNW6 H7RRo8QX4eXsYS/jVy/0nByGSxDoHTydE0PGvJJz/MuAh5O0W+jX7PEx/ixWB0IBRWtY 3n3MG3p6cC0fO57V7nQHUYI5VTJ56/afpANt+1YoeUHXDGMU6VKJnXbM08lpA+d7QEJF k+j4Lzm4DlehrHZyHwyKN91pnZQM8Y5ygcF077rR7hTQPcyBeUwGEXHMVpKw9oXdFp8L srwQ== X-Gm-Message-State: AOAM530lxxq2kVtDndXiMfZeYzltiWKpvkiIyl9ZSakRNJM3BwROCBk+ 0oRQPogn/d8GyUfflrvprbeaKbDO9PPSdvRvP7k= X-Google-Smtp-Source: ABdhPJzeYlezQln282kl3G7tkCkY/12kxvyvfsoWnlm0uSw2GCyKG9nOinl06tddOsncvr3NkmyfnQ== X-Received: by 2002:a63:894a:: with SMTP id v71mr35151686pgd.29.1641081397548; Sat, 01 Jan 2022 15:56:37 -0800 (PST) Return-Path: Received: from arrow ([98.45.152.168]) by smtp.gmail.com with ESMTPSA id s8sm11543763pfu.58.2022.01.01.15.56.37 for <9front@9front.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Jan 2022 15:56:37 -0800 (PST) From: Michael Forney Message-ID: <46F9DBF771CE337040E83F3DBA19CDEB@arrow> Date: Sat, 01 Jan 2022 22:51:18 +0000 To: 9front@9front.org MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: core SSL over HTML cloud shader-scale layer Subject: [9front] [PATCH] nusb/serial: fix pl2303 usbcmd error checks Reply-To: 9front@9front.org Precedence: bulk Since e0087b2a, usbcmd with Rh2d returns the size of the data stage (excluding the setup packet), so adjust the expected return values accordingly. --- diff 9c5ac15e11ffa2c5e57796c3a32baa769cce9aac 6b850d84118c8ee7e66b12daab17ef48fe65176e --- a/sys/src/cmd/nusb/serial/prolific.c Wed Feb 10 01:00:05 2021 +++ b/sys/src/cmd/nusb/serial/prolific.c Sat Jan 1 14:51:18 2022 @@ -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;