Skip to content

Commit

Permalink
staging: ozwpan: Insulate driver from HZ value
Browse files Browse the repository at this point in the history
This patch fixes issue caused due to different HZ
value on system which do not have HZ=1000

Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Rupesh Gujare authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 28a7229 commit 2416891
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/ozwpan/ozhcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/ozwpan/ozproto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 2416891

Please sign in to comment.