Commit 24ec03cc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: core: Restore sysfs fwnode information 



The change that restores sysfs fwnode information does it only for OF cases.
Update the fix to cover all possible types of fwnodes.

Fixes: d36f0e9a ("serial: core: restore of_node information in sysfs")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20251127163650.2942075-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f0b4cce

drivers/tty/serial/serial_base_bus.c

+6 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/device.h>

#include <linux/idr.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/property.h>

#include <linux/serial_core.h>

#include <linux/slab.h>

#include <linux/spinlock.h>
@@ -60,6 +60,7 @@ void serial_base_driver_unregister(struct device_driver *driver) 
	driver_unregister(driver);

}



/* On failure the caller must put device @dev with put_device() */

static int serial_base_device_init(struct uart_port *port,

				   struct device *dev,

				   struct device *parent_dev,
@@ -73,7 +74,8 @@ static int serial_base_device_init(struct uart_port *port, 
	dev->parent = parent_dev;

	dev->bus = &serial_base_bus_type;

	dev->release = release;

	device_set_of_node_from_dev(dev, parent_dev);



	device_set_node(dev, fwnode_handle_get(dev_fwnode(parent_dev)));



	if (!serial_base_initialized) {

		dev_dbg(port->dev, "uart_add_one_port() called before arch_initcall()?\n");
@@ -94,7 +96,7 @@ static void serial_base_ctrl_release(struct device *dev) 
{

	struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev);



	of_node_put(dev->of_node);

	fwnode_handle_put(dev_fwnode(dev));

	kfree(ctrl_dev);

}
@@ -142,7 +144,7 @@ static void serial_base_port_release(struct device *dev) 
{

	struct serial_port_device *port_dev = to_serial_base_port_device(dev);



	of_node_put(dev->of_node);

	fwnode_handle_put(dev_fwnode(dev));

	kfree(port_dev);

}