Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp480582iol; Thu, 9 Jun 2022 07:37:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbHP1bwlkIqI+l7IVMuiMLhr4vr1neTH9Izp6xKQQUnyDTSfSQ7rxyuYN9xOZL7bFj+kQ2 X-Received: by 2002:a05:6402:518b:b0:42d:fe74:98f9 with SMTP id q11-20020a056402518b00b0042dfe7498f9mr45588134edd.371.1654785448987; Thu, 09 Jun 2022 07:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654785448; cv=none; d=google.com; s=arc-20160816; b=MpQy2xSUGTBgJr+m6B0Y2osiw41AzpVz7Qk5ZfJNOSH/0chb35CF1/nGq/27cYiaEE TRnj9dZkJ7kn5ngtQ8FC7HakC5wvX2Zp6v7kZ8gEzryUNnB9SAw2K8pqSsAmXYs9Pnvk 7C8fV8LE3SnqivgWVUY2VOabogFtyN83MaAwqENYeS6MTggusi3UWY2N/0/mOq4so0zM mGbiEx7TP5Y4210t+V6acLIvTJU2kW672FeHO2RFiwTumDL/KNvDLQS7Jk+K3KI4EwCK s5vOGjpyKL1In8F2roQ0Ab+e0x6aG5rPnW8fLO8Sz7sJATkdLzF0aOf8O+LVnsGDG4Bd 5ZWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VD2yJGDPlbv5s7XWQ/k7rUJFEqJFO7fS57vmfQkNAeo=; b=osOlW4B0oy74jcFE97MuV2SyPpb2eux0MoheO2RP/ssC670l4f5u635O6a1QoSlaJ3 KscItiGNYTmWCJYeMbHv2lql0m5NfYe6lZUKMnGoC1lvfpyPtezBUWoYLQbO24hG/Pth bO+F0AXVvDuI61Aua8LNpFVPK2e62LAu1eHJVbmnnCNR7Rs/gJ/1A2CjoeV3TkBrrh/6 F6RaGFe3C5NOOpljrSiy+/iiS/1EH53aQX8wa0kEv7Rs8ZrAbsL/a0Ij2GNp5L9sIeb3 N6NuBf6IVxClYAOnNsNo8pEIr+Nynlzzk93dVDQg+ZllV6wXet9oJ0kkz1X5zDr5L8Ww ay2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="I/GeapL4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 30-20020a170906209e00b0071210178d11si1129200ejq.842.2022.06.09.07.36.55; Thu, 09 Jun 2022 07:37:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="I/GeapL4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245574AbiFIO0d (ORCPT + 99 others); Thu, 9 Jun 2022 10:26:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243680AbiFIO03 (ORCPT ); Thu, 9 Jun 2022 10:26:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC7C36FA1A; Thu, 9 Jun 2022 07:26:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8753561E14; Thu, 9 Jun 2022 14:26:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBD75C34115; Thu, 9 Jun 2022 14:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654784787; bh=mJKU6IxtGb73K0o7zmE3+f0ogV7uh8EFo83lJ4xT0io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I/GeapL4ZDGvqQVLPJ4mHudaXE56U/lDUQgXq3iPESeTAYN3rD2KCGIM8Oos1iWQb IcrZaVuXyCXoVkt6D7JaqZ1bu5uGpmzCyzSPSNBTBW/+L5GgpELAmqGQzeGBXn22Cf 8e8nCo8M6waOrraC069U68L52LUp/QbVJu/lUbei4Mb0mBJsYj789geBPfVnKLq3PF wSFqPMpqfXg3lopLVb/BTmJSwO3LzRhtEvRfsg0Fv2EAOJwgWLQ4fFlpEmntSYAJmO vYsQLdExNEKiJ8ogQG2IB3LRws9Oz/14noxkGQB0HATZQbZj1PeFwDCdr/Fxd9VCgh 3OgJvUGoSFyRw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1nzJ79-00069L-9r; Thu, 09 Jun 2022 16:26:23 +0200 From: Johan Hovold To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 1/3] media: flexcop-usb: clean up endpoint sanity checks Date: Thu, 9 Jun 2022 16:26:03 +0200 Message-Id: <20220609142605.23620-2-johan@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220609142605.23620-1-johan@kernel.org> References: <20220609142605.23620-1-johan@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a temporary variable to make the endpoint sanity checks a bit more readable. While at it, fix a typo in the usb_set_interface() comment. Signed-off-by: Johan Hovold --- drivers/media/usb/b2c2/flexcop-usb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c index e012b21c4fd7..31dd37d8236c 100644 --- a/drivers/media/usb/b2c2/flexcop-usb.c +++ b/drivers/media/usb/b2c2/flexcop-usb.c @@ -501,17 +501,21 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) static int flexcop_usb_init(struct flexcop_usb *fc_usb) { - /* use the alternate setting with the larges buffer */ - int ret = usb_set_interface(fc_usb->udev, 0, 1); + struct usb_host_interface *alt; + int ret; + /* use the alternate setting with the largest buffer */ + ret = usb_set_interface(fc_usb->udev, 0, 1); if (ret) { err("set interface failed."); return ret; } - if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1) + alt = fc_usb->uintf->cur_altsetting; + + if (alt->desc.bNumEndpoints < 1) return -ENODEV; - if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc)) + if (!usb_endpoint_is_isoc_in(&alt->endpoint[0].desc)) return -ENODEV; switch (fc_usb->udev->speed) { -- 2.35.1