From patchwork Tue Nov 19 05:19:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179700 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp169915ilf; Mon, 18 Nov 2019 21:51:10 -0800 (PST) X-Google-Smtp-Source: APXvYqwFZCG5tMS5S77pk8WQqmxx5Mid5Q2SyrbLNpv7Wa54YnQuJHH5K7VwUfbvXZELZnp75dXk X-Received: by 2002:a17:906:4e48:: with SMTP id g8mr31858700ejw.67.1574142670484; Mon, 18 Nov 2019 21:51:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142670; cv=none; d=google.com; s=arc-20160816; b=ivuGZcjbR05+ZRAHyW2rEM3ATKR/OqFP8ZlExCEih6dpYev0opJlA72GMzsSOx0tO8 M5nDajOJgImge5IdFcekgPAT1vN8zYPNsgeSdGxdd9URcnJZ8AeqLTHzQuT01PBG83Fs M/NTWTi2fESCUHqCJ5qojRZGvjM7U0vqZTupZmQOjx37MbFJC/1Ov/InGs5l7RnVqFV9 mxlevOBiSAagsB1DvYwLr+Uzg5dID6q8hbMjUFE7fGlvriYMlxdhBuoCVhHC/ajXNMO6 riMEJDOD4qBKGcv7Btqmr7uykHlfdpg+Lgk/eL6sO+p1rZuGXw7sxLQ52WId+RvJY5CX +U1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Jk7w5NByQfJUAU2soLPLrSDBTYyzk0c7obVC3VfqYtE=; b=t3X2048lKbB7zADIN+2jksS9Cf5qxEjJPpv5KrYOmRuyL+hHWtECymFDPeKTPYtvHB MsXXGmpa3+h7n+luUKDjraV7R38xFrCAWj9D1zi3PJBsPMY+zx9us7r7DIl66KuImhQu vM8sO8s6m/JkqKj47yNpSb373d3pFIOe+G79lH+Y2ydwJ0YcTwJJ5cpi+Y4knDz2ScCO 2w17y9zQeXd1TcgSqAuxtUYE+U/szDEWdjgXj2ZwzeEzZ8ak5EbJmksrjuJPD/tzWul4 qMj4S3FrArL5RcXFQsZ2rIkw46LjFDP7ZeeJakuLAcHsNw3Ccbr2J0+9vExIMRnpC8Ap rAog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DmS7kFm1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nq5si12820881ejb.161.2019.11.18.21.51.10; Mon, 18 Nov 2019 21:51:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DmS7kFm1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731739AbfKSFvH (ORCPT + 26 others); Tue, 19 Nov 2019 00:51:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:48428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731725AbfKSFvF (ORCPT ); Tue, 19 Nov 2019 00:51:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 147D521939; Tue, 19 Nov 2019 05:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142664; bh=HhY6aRuiU+JFIVbArd6TnC9cOXQnnSAEu6elwhYbO2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DmS7kFm1SKzwcCBlO4HklHSGFhPZWYS9snLX4gTzsq++eeIQ/X4Kc8w5cWXI8UOsq ligElru7JYGNSHXquLgukgXocCtr8bnQC5pJJPUz6+xTWg2uJ9VukbKq0nX7cGnFp5 nbzp73py2jMJiAR4mQc98MstAzn9SIlEd78WarNg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Loic Poulain , Peter Chen , Sasha Levin Subject: [PATCH 4.14 157/239] usb: chipidea: Fix otg event handler Date: Tue, 19 Nov 2019 06:19:17 +0100 Message-Id: <20191119051333.133155502@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 59739131e0ca06db7560f9073fff2fb83f6bc2a5 ] At OTG work running time, it's possible that several events need to be addressed (e.g. ID and VBUS events). The current implementation handles only one event at a time which leads to ignoring the other one. Fix it. Signed-off-by: Loic Poulain Signed-off-by: Peter Chen Signed-off-by: Sasha Levin --- drivers/usb/chipidea/otg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index 10236fe715228..8bf4032226ed5 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -206,14 +206,17 @@ static void ci_otg_work(struct work_struct *work) } pm_runtime_get_sync(ci->dev); + if (ci->id_event) { ci->id_event = false; ci_handle_id_switch(ci); - } else if (ci->b_sess_valid_event) { + } + + if (ci->b_sess_valid_event) { ci->b_sess_valid_event = false; ci_handle_vbus_change(ci); - } else - dev_err(ci->dev, "unexpected event occurs at %s\n", __func__); + } + pm_runtime_put_sync(ci->dev); enable_irq(ci->irq);