Эх сурвалжийг харах

Staging: btmtk_usb: Fix Sparse Warning of incorrect type in assignment

This patch fixes the following Sparse Warnings in btmtk_usb.c:

drivers/staging/btmtk_usb/btmtk_usb.c:676:39: warning: incorrect type in assignment (different base types)
drivers/staging/btmtk_usb/btmtk_usb.c:676:39:    expected unsigned int [unsigned] [usertype] packet_header
drivers/staging/btmtk_usb/btmtk_usb.c:676:39:    got restricted __le32 [usertype] <noident>

drivers/staging/btmtk_usb/btmtk_usb.c:736:31: warning: incorrect type in assignment (different base types)
drivers/staging/btmtk_usb/btmtk_usb.c:736:31:    expected unsigned int [unsigned] [addressable] [usertype] packet_header
drivers/staging/btmtk_usb/btmtk_usb.c:736:31:    got restricted __le32 [usertype] <noident>

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Rashika Kheria 12 жил өмнө
parent
commit
7ed57bca58

+ 5 - 4
drivers/staging/btmtk_usb/btmtk_usb.c

@@ -566,6 +566,7 @@ static int btmtk_usb_load_fw(struct btmtk_usb_data *data)
 	void *buf;
 	void *buf;
 	u32 cur_len = 0;
 	u32 cur_len = 0;
 	u32 packet_header = 0;
 	u32 packet_header = 0;
+	__le32 packet_header_le;
 	u32 value;
 	u32 value;
 	u32 ilm_len = 0, dlm_len = 0;
 	u32 ilm_len = 0, dlm_len = 0;
 	u16 fw_ver, build_ver;
 	u16 fw_ver, build_ver;
@@ -679,9 +680,9 @@ loadfw_protect:
 		if (sent_len > 0) {
 		if (sent_len > 0) {
 			packet_header &= ~(0xffffffff);
 			packet_header &= ~(0xffffffff);
 			packet_header |= (sent_len << 16);
 			packet_header |= (sent_len << 16);
-			packet_header = cpu_to_le32(packet_header);
+			packet_header_le = cpu_to_le32(packet_header);
 
 
-			memmove(buf, &packet_header, 4);
+			memmove(buf, &packet_header_le, 4);
 			memmove(buf + 4, data->firmware->data + 32 + cur_len,
 			memmove(buf + 4, data->firmware->data + 32 + cur_len,
 					sent_len);
 					sent_len);
 
 
@@ -739,9 +740,9 @@ loadfw_protect:
 
 
 		packet_header &= ~(0xffffffff);
 		packet_header &= ~(0xffffffff);
 		packet_header |= (sent_len << 16);
 		packet_header |= (sent_len << 16);
-		packet_header = cpu_to_le32(packet_header);
+		packet_header_le = cpu_to_le32(packet_header);
 
 
-		memmove(buf, &packet_header, 4);
+		memmove(buf, &packet_header_le, 4);
 		memmove(buf + 4,
 		memmove(buf + 4,
 			data->firmware->data + 32 + ilm_len + cur_len,
 			data->firmware->data + 32 + ilm_len + cur_len,
 			sent_len);
 			sent_len);