From: Parker Newman <[email protected]>
Change to returning dev_err_probe() instead of returning the error code
after calling dev_err_probe().
Signed-off-by: Parker Newman <[email protected]>
---
drivers/tty/serial/8250/8250_exar.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index a180741da634..01748ddbf729 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -1551,9 +1551,8 @@ exar_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
nr_ports = exar_get_nr_ports(board, pcidev);
if (nr_ports == 0) {
- dev_err_probe(&pcidev->dev, -ENODEV,
+ return dev_err_probe(&pcidev->dev, -ENODEV,
"failed to get number of ports\n");
- return -ENODEV;
}
priv = devm_kzalloc(&pcidev->dev, struct_size(priv, line, nr_ports), GFP_KERNEL);
@@ -1587,9 +1586,8 @@ exar_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
if (board->board_init) {
rc = board->board_init(priv, pcidev);
if (rc) {
- dev_err_probe(&pcidev->dev, rc,
+ return dev_err_probe(&pcidev->dev, rc,
"failed to init serial board\n");
- return rc;
}
}
--
2.43.2