Merge cb2ca58e4b into 99ab67143a

j1939_timedate/j1939_timedate_srv.c

@@ -41,23 +41,17 @@ static void gmtime_to_j1939_pgn_65254_td(struct j1939_time_date_packet *tdp)
 	utc_tm = gmtime_r(&now, &utc_tm_buf);
 	local_tm = localtime_r(&now, &local_tm_buf);
 
-	if (local_tm) {
+	/* Calculate the offsets */
-		/* Calculate the offsets */
+	hour_offset = local_tm->tm_hour - utc_tm->tm_hour;
-		hour_offset = local_tm->tm_hour - utc_tm->tm_hour;
+	minute_offset = local_tm->tm_min - utc_tm->tm_min;
-		minute_offset = local_tm->tm_min - utc_tm->tm_min;
 
-		/* Handle date rollover */
+	/* Handle date rollover */
-		if (local_tm->tm_mday != utc_tm->tm_mday) {
+	if (local_tm->tm_mday != utc_tm->tm_mday) {
-			if (local_tm->tm_hour < 12)
+		if (local_tm->tm_hour < 12)
-				hour_offset += 24;  /* past midnight */
+			hour_offset += 24;  /* past midnight */
-			else
+		else
-				hour_offset -= 24;  /* before midnight */
+			hour_offset -= 24;  /* before midnight */
-		}
+	}
-	} else {
-		/* The local time offsets cannot be determined at the moment */
-		hour_offset = 0xF9;
-		minute_offset = 0xFF;
-	}		
 
 	/*
 	 * Seconds (spn959):