Re: [BK PATCH] More USB changes for 2.5.38

Greg KH
2002-09-27T19:39:30Z

# ChangeSet 1.611.1.4 -> 1.611.1.5
# drivers/usb/storage/sddr55.c 1.4 -> 1.5
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/26 tim@physik3.uni-rostock.de 1.611.1.5
# [PATCH] fix compares of jiffies
#
# on rechecking the current stable kernel code, I found some places where jiffies
# were compared in a way that seems to break when they wrap. For these,
# I made up patches to use the macros "time_before()" or "time_after()"
# that are supposed to handle wraparound correctly.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
--- a/drivers/usb/storage/sddr55.c Fri Sep 27 12:30:17 2002
+++ b/drivers/usb/storage/sddr55.c Fri Sep 27 12:30:17 2002
@@ -788,7 +788,7 @@
/* only check card status if the map isn't allocated, ie no card seen yet
* or if it's been over half a second since we last accessed it
*/
- if (info->lba_to_pba == NULL || jiffies > (info->last_access + HZ/2)) {
+ if (info->lba_to_pba == NULL || time_after(jiffies, info->last_access + HZ/2)) {

/* check to see if a card is fitted */
result = sddr55_status (us);