Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ced80d authored by Jan Dumon's avatar Jan Dumon Committed by David S. Miller
Browse files

hso: Fix for endian issues on big endian machines 



Some fields are always little endian and have to be converted on big endian
machines.

Signed-off-by: default avatarJan Dumon <j.dumon@option.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec157937

drivers/net/usb/hso.c

+7 −5
Original line number Diff line number Diff line
@@ -1028,7 +1028,8 @@ static void read_bulk_callback(struct urb *urb) 
	if (odev->parent->port_spec & HSO_INFO_CRC_BUG) {

		u32 rest;

		u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };

		rest = urb->actual_length % odev->in_endp->wMaxPacketSize;

		rest = urb->actual_length %

			le16_to_cpu(odev->in_endp->wMaxPacketSize);

		if (((rest == 5) || (rest == 6)) &&

		    !memcmp(((u8 *) urb->transfer_buffer) +

			    urb->actual_length - 4, crc_check, 4)) {
@@ -1234,7 +1235,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb) 
			u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };

			rest =

			    urb->actual_length %

			    serial->in_endp->wMaxPacketSize;

			    le16_to_cpu(serial->in_endp->wMaxPacketSize);

			if (((rest == 5) || (rest == 6)) &&

			    !memcmp(((u8 *) urb->transfer_buffer) +

				    urb->actual_length - 4, crc_check, 4)) {
@@ -2843,7 +2844,8 @@ struct hso_shared_int *hso_create_shared_int(struct usb_interface *interface) 
		dev_err(&interface->dev, "Could not allocate intr urb?");

		goto exit;

	}

	mux->shared_intr_buf = kzalloc(mux->intr_endp->wMaxPacketSize,

	mux->shared_intr_buf =

		kzalloc(le16_to_cpu(mux->intr_endp->wMaxPacketSize),

			GFP_KERNEL);

	if (!mux->shared_intr_buf) {

		dev_err(&interface->dev, "Could not allocate intr buf?");
@@ -3241,7 +3243,7 @@ static int hso_mux_submit_intr_urb(struct hso_shared_int *shared_int, 
			 usb_rcvintpipe(usb,

				shared_int->intr_endp->bEndpointAddress & 0x7F),

			 shared_int->shared_intr_buf,

			 shared_int->intr_endp->wMaxPacketSize,

			 1,

			 intr_callback, shared_int,

			 shared_int->intr_endp->bInterval);