Message ID | 20210413095201.2409865-12-mkl@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 5e164a4f0aaee1b604e920a8cf99878c06fe3f11 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | pull-request: can-next 2021-04-13 | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Series ignored based on subject |
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c index 671d589b48c1..fd5ea95fd55d 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb.c @@ -365,16 +365,17 @@ static int pcan_usb_get_serial(struct peak_usb_device *dev, u32 *serial_number) int err; err = pcan_usb_wait_rsp(dev, PCAN_USB_CMD_SN, PCAN_USB_GET, args); - if (err) { - netdev_err(dev->netdev, "getting serial failure: %d\n", err); - } else if (serial_number) { + if (err) + return err; + + if (serial_number) { __le32 tmp32; memcpy(&tmp32, args, 4); *serial_number = le32_to_cpu(tmp32); } - return err; + return 0; } /*