Skip to content

Commit 673cf89

Browse files
committed
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
2 parents b933c72 + 6c0e9f0 commit 673cf89

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/tty/serial/pch_uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
954954
__func__);
955955
return 0;
956956
}
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);
958958
priv->desc_tx = desc;
959959
desc->callback = pch_dma_tx_complete;
960960
desc->callback_param = priv;

drivers/tty/serial/serial_base_bus.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/device.h>
1414
#include <linux/idr.h>
1515
#include <linux/module.h>
16+
#include <linux/of.h>
1617
#include <linux/serial_core.h>
1718
#include <linux/slab.h>
1819
#include <linux/spinlock.h>
@@ -93,6 +94,7 @@ static void serial_base_ctrl_release(struct device *dev)
9394
{
9495
struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev);
9596

97+
of_node_put(dev->of_node);
9698
kfree(ctrl_dev);
9799
}
98100

@@ -140,6 +142,7 @@ static void serial_base_port_release(struct device *dev)
140142
{
141143
struct serial_port_device *port_dev = to_serial_base_port_device(dev);
142144

145+
of_node_put(dev->of_node);
143146
kfree(port_dev);
144147
}
145148

0 commit comments

Comments
 (0)