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

Commit 777471a4 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Greg Kroah-Hartman
Browse files

greybus: Fixup __u64, __u32 to __le64, __le32 in timesync declarations 



A number of data in TimeSync command structures are declared __u64/__u32
instead of __le64/__le32, I forgot to put this through an x86_64 compile
before presentation for merge and as a result didn't catch this error. This
patch fixes.

Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent a7ddda1f

drivers/staging/greybus/control.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -269,7 +269,7 @@ int gb_control_timesync_authoritative(struct gb_control *control, 
	int i;

	int i;





	for (i = 0; i < GB_TIMESYNC_MAX_STROBES; i++)

	for (i = 0; i < GB_TIMESYNC_MAX_STROBES; i++)

		request.frame_time[i] = frame_time[i];

		request.frame_time[i] = cpu_to_le64(frame_time[i]);





	return gb_operation_sync(control->connection,

	return gb_operation_sync(control->connection,

				 GB_CONTROL_TYPE_TIMESYNC_AUTHORITATIVE,

				 GB_CONTROL_TYPE_TIMESYNC_AUTHORITATIVE,

drivers/staging/greybus/greybus_protocols.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ struct gb_control_timesync_enable_request { 
/* timesync enable response has no payload */

/* timesync enable response has no payload */





struct gb_control_timesync_authoritative_request {

struct gb_control_timesync_authoritative_request {

	__u64	frame_time[GB_TIMESYNC_MAX_STROBES];

	__le64	frame_time[GB_TIMESYNC_MAX_STROBES];

} __packed;

} __packed;

/* timesync authoritative response has no payload */

/* timesync authoritative response has no payload */
@@ -911,16 +911,16 @@ struct gb_svc_route_destroy_request { 




struct gb_svc_timesync_enable_request {

struct gb_svc_timesync_enable_request {

	__u8	count;

	__u8	count;

	__u64	frame_time;

	__le64	frame_time;

	__u32	strobe_delay;

	__le32	strobe_delay;

	__u32	strobe_mask;

	__le32	strobe_mask;

	__u32	refclk;

	__le32	refclk;

} __packed;

} __packed;

/* timesync enable response has no payload */

/* timesync enable response has no payload */





/* timesync authoritative request has no payload */

/* timesync authoritative request has no payload */

struct gb_svc_timesync_authoritative_response {

struct gb_svc_timesync_authoritative_response {

	__u64	frame_time[GB_TIMESYNC_MAX_STROBES];

	__le64	frame_time[GB_TIMESYNC_MAX_STROBES];

};

};





#define GB_SVC_UNIPRO_FAST_MODE			0x01

#define GB_SVC_UNIPRO_FAST_MODE			0x01