From patchwork Mon Aug 17 15:16:15 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: 266243 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 93C49C433E1 for ; Mon, 17 Aug 2020 18:14:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7919E20789 for ; Mon, 17 Aug 2020 18:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597688053; bh=rPYc3AInrmGfeTHQs2L3TSEMnna29Wvbsg8g5ZM1mDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Afq09M8tMqG26u7J2MPqhyyU1Zzcmbih8GeI7aj43/sm5xzjCcxr/fuUO6iAwo9uL mjnLxKZ9rzBzeh+Moo/9wHy4M0FDwQjnp74qelpPEESzUCNWopmv0a0MLoTU8ZQm3R Rt3bTGFgQHwVuMSyEAU3OMo1P7xM++mvvxc5J4Oc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390451AbgHQSNu (ORCPT ); Mon, 17 Aug 2020 14:13:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:54856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731062AbgHQQGv (ORCPT ); Mon, 17 Aug 2020 12:06:51 -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 A465720B1F; Mon, 17 Aug 2020 16:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680404; bh=rPYc3AInrmGfeTHQs2L3TSEMnna29Wvbsg8g5ZM1mDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0BTA/cftcnlXf5lM7a3y+7ZQAs/EZg3TaZ0rVZWglWgpMQrt5KgN3D38m+IsgCh+S H9RZfqJhZIGkQwQIBaL3LVNqDXk3i6NreF91yFnH2/uqVtnxPJHg4UyYSAOVAN2lw2 VpctZzlNbTV5PhlMeSp44ock/XMTDJT8H0qaaHHI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Boichat , Hans de Goede , Marcel Holtmann , Sasha Levin Subject: [PATCH 5.4 174/270] Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Date: Mon, 17 Aug 2020 17:16:15 +0200 Message-Id: <20200817143804.488785996@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolas Boichat [ Upstream commit a7ad4b6119d740b1ec5788f1b98be0fd1c1b5a5a ] HCI_UART_RESET_ON_INIT belongs in hdev_flags, not flags. Fixes: ce945552fde4a09 ("Bluetooth: hci_h5: Add support for serdev enumerated devices") Signed-off-by: Nicolas Boichat Reviewed-by: Hans de Goede Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_h5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index dacf297baf595..5df0651b6cd55 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -790,7 +790,7 @@ static int h5_serdev_probe(struct serdev_device *serdev) if (!h5) return -ENOMEM; - set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.flags); + set_bit(HCI_UART_RESET_ON_INIT, &h5->serdev_hu.hdev_flags); h5->hu = &h5->serdev_hu; h5->serdev_hu.serdev = serdev;