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

Commit 296bd4bd authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez
Browse files

wimax/i2400m: Fix USB timeout specifications (to ms from HZ) 



The USB code was incorrectly specifiying timeouts to be in jiffies vs
msecs. On top of that, lower it to 200ms, as 1s is really too long
(doesn't allow the watchdog to trip a reset if the device timesout too
often).

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
parent 5ab5a721

drivers/net/wimax/i2400m/usb-fw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ ssize_t i2400mu_tx_bulk_out(struct i2400mu *i2400mu, void *buf, size_t buf_size) 
	epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out);

	epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out);

	pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

retry:

retry:

	result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, HZ);

	result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, 200);

	switch (result) {

	switch (result) {

	case 0:

	case 0:

		if (len != buf_size) {

		if (len != buf_size) {

drivers/net/wimax/i2400m/usb-rx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ retry: 
	}

	}

	result = usb_bulk_msg(

	result = usb_bulk_msg(

		i2400mu->usb_dev, usb_pipe, rx_skb->data + rx_skb->len,

		i2400mu->usb_dev, usb_pipe, rx_skb->data + rx_skb->len,

		rx_size, &read_size, HZ);

		rx_size, &read_size, 200);

	usb_mark_last_busy(i2400mu->usb_dev);

	usb_mark_last_busy(i2400mu->usb_dev);

	switch (result) {

	switch (result) {

	case 0:

	case 0:

drivers/net/wimax/i2400m/usb-tx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ int i2400mu_tx(struct i2400mu *i2400mu, struct i2400m_msg_hdr *tx_msg, 
	usb_pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	usb_pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

retry:

retry:

	result = usb_bulk_msg(i2400mu->usb_dev, usb_pipe,

	result = usb_bulk_msg(i2400mu->usb_dev, usb_pipe,

			      tx_msg, tx_msg_size, &sent_size, HZ);

			      tx_msg, tx_msg_size, &sent_size, 200);

	usb_mark_last_busy(i2400mu->usb_dev);

	usb_mark_last_busy(i2400mu->usb_dev);

	switch (result) {

	switch (result) {

	case 0:

	case 0:

drivers/net/wimax/i2400m/usb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ int __i2400mu_send_barker(struct i2400mu *i2400mu, 
	pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);

	memcpy(buffer, barker, barker_size);

	memcpy(buffer, barker, barker_size);

	ret = usb_bulk_msg(i2400mu->usb_dev, pipe, buffer, barker_size,

	ret = usb_bulk_msg(i2400mu->usb_dev, pipe, buffer, barker_size,

			   &actual_len, HZ);

			   &actual_len, 200);

	if (ret < 0) {

	if (ret < 0) {

		if (ret != -EINVAL)

		if (ret != -EINVAL)

			dev_err(dev, "E: barker error: %d\n", ret);

			dev_err(dev, "E: barker error: %d\n", ret);