Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tty-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fixes from Greg KH:
"Here are two serial driver fixes for 6.16-rc6 that do:
- fix for the serial core OF resource leak
- pch_uart driver fix for a "incorrect variable" issue
Both of these have been in linux-next for over a week with no reported
problems"
* tag 'tty-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
pch_uart: Fix dma_sync_sg_for_device() nents value
serial: core: fix OF node leak
+4
-1
+1
-1
drivers/tty/serial/pch_uart.c
+1
-1
drivers/tty/serial/pch_uart.c
···
954
954
__func__);
955
955
return 0;
956
956
}
957
-
dma_sync_sg_for_device(port->dev, priv->sg_tx_p, nent, DMA_TO_DEVICE);
957
+
dma_sync_sg_for_device(port->dev, priv->sg_tx_p, num, DMA_TO_DEVICE);
958
958
priv->desc_tx = desc;
959
959
desc->callback = pch_dma_tx_complete;
960
960
desc->callback_param = priv;
+3
drivers/tty/serial/serial_base_bus.c
+3
drivers/tty/serial/serial_base_bus.c
···
13
13
#include <linux/device.h>
14
14
#include <linux/idr.h>
15
15
#include <linux/module.h>
16
+
#include <linux/of.h>
16
17
#include <linux/serial_core.h>
17
18
#include <linux/slab.h>
18
19
#include <linux/spinlock.h>
···
94
93
{
95
94
struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev);
96
95
96
+
of_node_put(dev->of_node);
97
97
kfree(ctrl_dev);
98
98
}
99
99
···
142
140
{
143
141
struct serial_port_device *port_dev = to_serial_base_port_device(dev);
144
142
143
+
of_node_put(dev->of_node);
145
144
kfree(port_dev);
146
145
}
147
146