usb: xhci: Clean up error code in xhci_dbc_tty_register_device()

PATCH New Mathias Nyman 1 participant 1 message Mar 16, 2018

Subsystems (2)

USB USB xHCI driver

lore

Share & tools

lore

Mathias Nyman

author

2018-03-16 14:32 UTC #0 lore raw

PATCH 1/9 usb: xhci: Clean up error code in xhci_dbc_tty_register_device()

From: Dan Carpenter <[email protected]>

tty_port_register_device() returns error pointers on error, never NULL. The IS_ERR_OR_NULL() function returns either 1 or 0 so it means we return 1 on error instead of a proper error code. The caller only checks for zero vs non-zero so this doesn't affect runtime.

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/usb/host/xhci-dbgtty.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

drivers/usb/host/xhci-dbgtty.c +3 -2

index 8d47b6f..6f534b6 100644
@@ -443,9 +443,10 @@ int xhci_dbc_tty_register_device(struct xhci_hcd *xhci)
 	xhci_dbc_tty_init_port(xhci, port);
 	tty_dev = tty_port_register_device(&port->port,
 					   dbc_tty_driver, 0, NULL);
-	ret = IS_ERR_OR_NULL(tty_dev);
-	if (ret)
+	if (IS_ERR(tty_dev)) {
+		ret = PTR_ERR(tty_dev);
 		goto register_fail;
+	}
 
 	ret = kfifo_alloc(&port->write_fifo, DBC_WRITE_BUF_SIZE, GFP_KERNEL);
 	if (ret)