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=-9.8 required=3.0 tests=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 37A0DC2D0DB for ; Fri, 24 Jan 2020 11:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05A19206D4 for ; Fri, 24 Jan 2020 11:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865027; bh=ubiPHxkmrdVJDYqoeAl2Gn8dF4bT82bZMoe81iJ6Z7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0uVj7BIqwhCvPuBtT8duHlDGX/3byVujwWZVkNySWSKujgPDQvLooNUrQRdtVnb9J CH16jV9YrJVT3gDvQmEliUu66VbE984X72S9oFhuGM9Vr/dtqrBojtUJoB9zJfZwoU 6zGLLTrASwiH9zet8aoWcYiMHkiD9+x5bVu84V74= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391370AbgAXLXp (ORCPT ); Fri, 24 Jan 2020 06:23:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:36454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388604AbgAXLXn (ORCPT ); Fri, 24 Jan 2020 06:23:43 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 A2BCB206D4; Fri, 24 Jan 2020 11:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865023; bh=ubiPHxkmrdVJDYqoeAl2Gn8dF4bT82bZMoe81iJ6Z7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y6uKD29GSbv1EPGf3Z00vqJsI4d+3WTRFmhvxiLXK9TWZrlLLscP3jgqG1c0W1KDM deCUzyvcbOHM2GuBssKE5EDdllQFHNOUE/GlLOu0E5UNjCCmJcSZRbiszJLJy0xQ5t HeME1vKYBFqpQ/CEG4Id6XdyKE/IAhkRNID7FO5k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borut Seljak , Sasha Levin Subject: [PATCH 4.19 417/639] serial: stm32: fix a recursive locking in stm32_config_rs485 Date: Fri, 24 Jan 2020 10:29:47 +0100 Message-Id: <20200124093139.236423702@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borut Seljak [ Upstream commit 707aeea13a9c85520262e11899d86df3c4b48262 ] Remove spin_lock_irqsave in stm32_config_rs485, it cause recursive locking. Already locked in uart_set_rs485_config. Fixes: 1bcda09d291081 ("serial: stm32: add support for RS485 hardware control mode") Signed-off-by: Borut Seljak Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/stm32-usart.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index 1334e42939776..d096e552176cc 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -105,9 +105,7 @@ static int stm32_config_rs485(struct uart_port *port, struct stm32_usart_config *cfg = &stm32_port->info->cfg; u32 usartdiv, baud, cr1, cr3; bool over8; - unsigned long flags; - spin_lock_irqsave(&port->lock, flags); stm32_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); port->rs485 = *rs485conf; @@ -147,7 +145,6 @@ static int stm32_config_rs485(struct uart_port *port, } stm32_set_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit)); - spin_unlock_irqrestore(&port->lock, flags); return 0; } -- 2.20.1