Commit 673cf893 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b933c72d 6c0e9f05

drivers/tty/serial/pch_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv) 
			__func__);

		return 0;

	}

	dma_sync_sg_for_device(port->dev, priv->sg_tx_p, nent, DMA_TO_DEVICE);

	dma_sync_sg_for_device(port->dev, priv->sg_tx_p, num, DMA_TO_DEVICE);

	priv->desc_tx = desc;

	desc->callback = pch_dma_tx_complete;

	desc->callback_param = priv;

drivers/tty/serial/serial_base_bus.c

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

#include <linux/idr.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/serial_core.h>

#include <linux/slab.h>

#include <linux/spinlock.h>
@@ -93,6 +94,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);

	kfree(ctrl_dev);

}
@@ -140,6 +142,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);

	kfree(port_dev);

}