From patchwork Thu Nov 26 18:02:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 333036 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp1516768ilb; Thu, 26 Nov 2020 10:04:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwc6et6cL7svmPhQE4hrxTEVDrUsy6LkZ9yci9wveF9HKMjd6J1PuF3RTtiYN6EWwVB8EIn X-Received: by 2002:a50:f682:: with SMTP id d2mr3723295edn.95.1606413879068; Thu, 26 Nov 2020 10:04:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606413879; cv=none; d=google.com; s=arc-20160816; b=AYRB2oU1WWG5Nu9//RbK+BPWIkFuwECCeXN6DEL07+11ckbazqlD1HJZi/0uat9RCc EH2nV3jhOwlskpH8KaJHCOSFMvgnVKxSXxanhscnLxrE1fov/uJ1E875o5uefCKic3cT dyukfMPeK1JAq2fyBcJzxpAxwUhZ5KlH9tpnPLa9mTn2mp7maxhM1Zx10I4fyFy4DTsk s1f1cLQs5IANFpI2vyfJJvFtSeTiPbc167CUb6tKtebUAESdyP7NREAliNXczICzCZQz aAezGYPzSjaQnNbfVRrFr3hKsQMngZcW/U5lu74X753qvHe2Th1QrpcMDPeGG3+uNvVt QWjA== 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; bh=iRaoLE2Nv/3zZDzc7xxNOsjc9OQHX008zESaLawlQfk=; b=adsOGsb6iP9j+KkVxKl3h2L/7kATtASAq4phVuxdbAxvzV7oDgPA7O6sevQ1lxY+rM Tk2XqLBdxFQ1SQk6AQsVztEG2ZqvkkFgAQiExji2MH946ppIb5yBEWWzPD2gGe84E8Tr HJPOyYKtNhTFgB9p/k0P6LAnDumBd/3nv1KYgA7S11EWC0C5MUaaQMKQNYFp8dtQcORC sr3faCtcA5QdzVcW3QhD66E9FMKYM3doXABm2kYGcQDenAaIWH9Db4pC1vTWnKaXrMx+ Saw24pV/ioBrQAjQQh/VYrf8Tn/+HLhzLmm3jK9NK70GY1ZtfscapfSNe0YJCJhOZJkU kBFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s3si3505960ejc.65.2020.11.26.10.04.38; Thu, 26 Nov 2020 10:04:39 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404641AbgKZSCw (ORCPT + 14 others); Thu, 26 Nov 2020 13:02:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:52952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404528AbgKZSCw (ORCPT ); Thu, 26 Nov 2020 13:02:52 -0500 Received: from localhost (82-217-20-185.cable.dynamic.v4.ziggo.nl [82.217.20.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 95207207BC; Thu, 26 Nov 2020 18:02:51 +0000 (UTC) From: Greg Kroah-Hartman To: balbi@kernel.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Will McVicker , stable , Greg Kroah-Hartman Subject: [PATCH 4/4] USB: gadget: f_midi: setup SuperSpeed Plus descriptors Date: Thu, 26 Nov 2020 19:02:35 +0100 Message-Id: <20201126180235.254523-4-gregkh@google.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126180235.254523-1-gregkh@google.com> References: <20201126180235.254523-1-gregkh@google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will McVicker Needed for SuperSpeed Plus support for f_midi. This allows the gadget to work properly without crashing at SuperSpeed rates. Cc: Felipe Balbi Cc: stable Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/f_midi.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.29.2 diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 85cb15734aa8..ceb67651de4f 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1048,6 +1048,11 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) f->ss_descriptors = usb_copy_descriptors(midi_function); if (!f->ss_descriptors) goto fail_f_midi; + if (gadget_is_superspeed_plus(c->cdev->gadget)) { + f->ssp_descriptors = usb_copy_descriptors(midi_function); + if (!f->ssp_descriptors) + goto fail_f_midi; + } } kfree(midi_function);