From: Guanbing Huang <albanhuang@xxxxxxxxxxx>
The function __uart_read_properties doesn't cover pnp devices, so add irq
processing for pnp devices in the branch.
Signed-off-by: Guanbing Huang <albanhuang@xxxxxxxxxxx>
Reviewed-by: Bing Fan <tombinfan@xxxxxxxxxxx>
Tested-by: Linheng Du <dylanlhdu@xxxxxxxxxxx>
---
drivers/tty/serial/serial_port.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index 22b9eeb23e68..6ed072d61b88 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -14,6 +14,7 @@
#include <linux/property.h>
#include <linux/serial_core.h>
#include <linux/spinlock.h>
+#include <linux/pnp.h>
#include "serial_base.h"
@@ -221,7 +222,11 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
if (dev_is_platform(dev))
ret = platform_get_irq(to_platform_device(dev), 0);
- else
+ else if (dev_is_pnp(dev)) {
+ ret = pnp_irq(to_pnp_dev(dev), 0);
+ if (ret < 0)
+ ret = -ENXIO;
+ } else
ret = fwnode_irq_get(dev_fwnode(dev), 0);
if (ret == -EPROBE_DEFER)
return ret;
--
2.17.1
