Unverified Commit 02de269c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8316 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/DHEQPUI2YOL766AZ5QHBGLQWNECVL5CZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4LE 
 
Link:https://gitee.com/openeuler/kernel/pulls/8316

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 8f17e7b7 45e02b88

drivers/net/usb/kalmia.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -69,8 +69,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);

		init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT);

	if (status != 0) {

	if (status != 0) {

		netdev_err(dev->net,

		netdev_err(dev->net,

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

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

			status, act_len);

			status);

		return status;

		return status;

	}

	}

	else if (act_len != init_msg_len) {

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




	if (status != 0)

	if (status != 0)

		netdev_err(dev->net,

		netdev_err(dev->net,

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

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

			status, act_len);

			status);

	else if (act_len != expected_len)

	else if (act_len != expected_len)

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

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

			act_len);

			act_len);