From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0548AE571; Mon, 14 Oct 2024 14:26:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916001; cv=none; b=s6Fv6AC3LpAAgG3fRzUOVxJc4Fgfdn/4POKUI82hvK18ouEoNw0HBaETwRkfwr15qo4zJ7PdDE48hsQbT77RHC/nE6Pd/MW2nlmhDBPjdmje4md6oR5vhPBMMsIIGkOSyg8kOFP/hIu/2tLF6rd2/PbtzL9PqRnZi6WjcmgRYwc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916001; c=relaxed/simple; bh=5TusMgiGF2z2oVW5neFTAaKhs8uvNa/38rUL5IzQtzY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kCwwI46m2PQvMLk9oBAKCUA3YDn4XiVzdseQ9AI+3zOfJHaaMZvUgfcB3dvau6fEMagpIqLVzX0O1QcfwFHOS+6+3UWbWUKft64/u3Xz1Xsw7NoPy3qIFQIq49vi1cbcY6FF4c6e/5jerIg15Xk5ENod0W1q535cdjlnPYL4T8s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1WLl9i8s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1WLl9i8s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B95CC4CEC3; Mon, 14 Oct 2024 14:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728916000; bh=5TusMgiGF2z2oVW5neFTAaKhs8uvNa/38rUL5IzQtzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WLl9i8srJ3RBl77tcEIGQ9xOpN10TCNxMhKXU1mkiS+DRarnnvcmDc66ZasgYXNX sbUMLhhTp73skZ+xMs1GBmU9iAmAJWAakGdf1VlZ42mJGfI24TDnfZxoaDoDEwF2tU DFUUb7nxXcAVtF3T0NEGKOAhH2RKYX8vdmaNpcG4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wadim Egorov , Heikki Krogerus , Sasha Levin Subject: [PATCH 6.11 055/214] usb: typec: tipd: Free IRQ only if it was requested before Date: Mon, 14 Oct 2024 16:18:38 +0200 Message-ID: <20241014141047.136936476@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141044.974962104@linuxfoundation.org> References: <20241014141044.974962104@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wadim Egorov [ Upstream commit db63d9868f7f310de44ba7bea584e2454f8b4ed0 ] In polling mode, if no IRQ was requested there is no need to free it. Call devm_free_irq() only if client->irq is set. This fixes the warning caused by the tps6598x module removal: WARNING: CPU: 2 PID: 333 at kernel/irq/devres.c:144 devm_free_irq+0x80/0x8c ... ... Call trace: devm_free_irq+0x80/0x8c tps6598x_remove+0x28/0x88 [tps6598x] i2c_device_remove+0x2c/0x9c device_remove+0x4c/0x80 device_release_driver_internal+0x1cc/0x228 driver_detach+0x50/0x98 bus_remove_driver+0x6c/0xbc driver_unregister+0x30/0x60 i2c_del_driver+0x54/0x64 tps6598x_i2c_driver_exit+0x18/0xc3c [tps6598x] __arm64_sys_delete_module+0x184/0x264 invoke_syscall+0x48/0x110 el0_svc_common.constprop.0+0xc8/0xe8 do_el0_svc+0x20/0x2c el0_svc+0x28/0x98 el0t_64_sync_handler+0x13c/0x158 el0t_64_sync+0x190/0x194 Signed-off-by: Wadim Egorov Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20240816124150.608125-1-w.egorov@phytec.de Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/tipd/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index dd51a25480bfb..256b0c054e9a9 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -1465,8 +1465,9 @@ static void tps6598x_remove(struct i2c_client *client) if (!client->irq) cancel_delayed_work_sync(&tps->wq_poll); + else + devm_free_irq(tps->dev, client->irq, tps); - devm_free_irq(tps->dev, client->irq, tps); tps6598x_disconnect(tps, 0); typec_unregister_port(tps->port); usb_role_switch_put(tps->role_sw); -- 2.43.0