From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C7AC43381 for ; Mon, 1 Apr 2019 17:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDA35208E4 for ; Mon, 1 Apr 2019 17:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554141577; bh=sp1/TpeWV76dQeT286AN3MUzAoHDku+VJDi9jyRoV4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XKcmrGIntVIHgp8VGIpQTUffkbatOMpWnfb5B0dPF0JsxCDjGynMi3JNo+EiUFCZb Dx7qgmfTt2Tz6tYzUp12Zr5Yr1oCyYzTAnpiY4kR5LWWf1zTrBE8CBClOsOdUhdVee RFvs1+iShEDhjEbC+vyR8ZKvyqZDMsyDTsNZsbo0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731068AbfDARR5 (ORCPT ); Mon, 1 Apr 2019 13:17:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:44518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731039AbfDARR4 (ORCPT ); Mon, 1 Apr 2019 13:17:56 -0400 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 5AFE6206C0; Mon, 1 Apr 2019 17:17:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139075; bh=sp1/TpeWV76dQeT286AN3MUzAoHDku+VJDi9jyRoV4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BdzDpRXV2CsQRQIsgft+tyi4lolye5txD80tf4dthNXJejdRsKn2ucjEsqYgIehjU g1FnEdtAxEaKmytmj8psRuSdfO3aAUypYp8H3McjHk67l/ktP6JDuqjKyUb9coTMRc AEmM8mqLTpwEsmwybfZViTayqrqVo8m15fYK/g1k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Fabrizio Castro Subject: [PATCH 4.19 105/134] usb: common: Consider only available nodes for dr_mode Date: Mon, 1 Apr 2019 19:02:21 +0200 Message-Id: <20190401170054.021647310@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fabrizio Castro commit 238e0268c82789e4c107a37045d529a6dbce51a9 upstream. There are cases where multiple device tree nodes point to the same phy node by means of the "phys" property, but we should only consider those nodes that are marked as available rather than just any node. Fixes: 98bfb3946695 ("usb: of: add an api to get dr_mode by the phy node") Cc: stable@vger.kernel.org # v4.4+ Signed-off-by: Fabrizio Castro Signed-off-by: Greg Kroah-Hartman --- drivers/usb/common/common.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -145,6 +145,8 @@ enum usb_dr_mode of_usb_get_dr_mode_by_p do { controller = of_find_node_with_property(controller, "phys"); + if (!of_device_is_available(controller)) + continue; index = 0; do { if (arg0 == -1) {