Unverified Commit 33658d32 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8317 net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AKACCONK6ZXMJV364AUR72FS2DSXKXKU/ 
 
https://gitee.com/openeuler/kernel/issues/I7V9QX 
 
Link:https://gitee.com/openeuler/kernel/pulls/8317

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e720cd2a 31b41cbd

drivers/net/usb/kalmia.c

+4 −4
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, 
		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);

	if (status != 0) {

		netdev_err(dev->net,

			"Error sending init packet. Status %i, length %i\n",

			status, act_len);

			"Error sending init packet. Status %i\n",

			status);

		return status;

	}

	else if (act_len != init_msg_len) {
@@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, 


	if (status != 0)

		netdev_err(dev->net,

			"Error receiving init result. Status %i, length %i\n",

			status, act_len);

			"Error receiving init result. Status %i\n",

			status);

	else if (act_len != expected_len)

		netdev_err(dev->net, "Unexpected init result length: %i\n",

			act_len);