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

Commit 24168911 authored by Rupesh Gujare's avatar Rupesh Gujare Committed by Greg Kroah-Hartman
Browse files

staging: ozwpan: Insulate driver from HZ value 



This patch fixes issue caused due to different HZ
value on system which do not have HZ=1000

Signed-off-by: default avatarRupesh Gujare <rgujare@ozmodevices.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28a72295

drivers/staging/ozwpan/ozhcd.c

+4 −4
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ int oz_hcd_heartbeat(void *hport) 
		ep = ep_from_link(e);

		if (ep->credit < 0)

			continue;

		ep->credit += (now - ep->last_jiffies);

		ep->credit += jiffies_to_msecs(now - ep->last_jiffies);

		if (ep->credit > ep->credit_ceiling)

			ep->credit = ep->credit_ceiling;

		oz_event_log(OZ_EVT_EP_CREDIT, ep->ep_num, 0, 0, ep->credit);
@@ -1062,7 +1062,7 @@ int oz_hcd_heartbeat(void *hport) 
			urbl = list_first_entry(&ep->urb_list,

				struct oz_urb_link, link);

			urb = urbl->urb;

			if (ep->credit < urb->number_of_packets)

			if ((ep->credit + 1) < urb->number_of_packets)

				break;

			ep->credit -= urb->number_of_packets;

			oz_event_log(OZ_EVT_EP_CREDIT, ep->ep_num, 0, 0,
@@ -1105,7 +1105,7 @@ int oz_hcd_heartbeat(void *hport) 
			}

			continue;

		}

		ep->credit += (now - ep->last_jiffies);

		ep->credit += jiffies_to_msecs(now - ep->last_jiffies);

		oz_event_log(OZ_EVT_EP_CREDIT, ep->ep_num | USB_DIR_IN,

			0, 0, ep->credit);

		ep->last_jiffies = now;
@@ -1117,7 +1117,7 @@ int oz_hcd_heartbeat(void *hport) 
			int len = 0;

			int copy_len;

			int i;

			if (ep->credit < urb->number_of_packets)

			if ((ep->credit + 1) < urb->number_of_packets)

				break;

			if (ep->buffered_units < urb->number_of_packets)

				break;

drivers/staging/ozwpan/ozproto.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


/* Converts millisecs to jiffies.

 */

#define oz_ms_to_jiffies(__x)	(((__x)*1000)/HZ)

#define oz_ms_to_jiffies(__x)	msecs_to_jiffies(__x)



/* Quantum milliseconds.

 */