Skip to content

Commit

Permalink
greybus: camera: fix data types of operations
Browse files Browse the repository at this point in the history
In some operations definitions it was introduce some new fields with
the wrong data types, u8, instead of __u8. And because of this gbsim
build was broken.

Fixes: 3a1d7aa15bf6 ("greybus: Add camera protocol definition")

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
  • Loading branch information
Rui Miguel Silva authored and Greg Kroah-Hartman committed Dec 18, 2015
1 parent 65fabd1 commit 8e77c83
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/greybus/greybus_protocols.h
Original file line number Diff line number Diff line change
Expand Up @@ -1143,18 +1143,18 @@ struct gb_camera_stream_config_response {
struct gb_camera_configure_streams_response {
__le16 num_streams;
#define GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED 0x01
u8 flags;
u8 padding;
__u8 flags;
__u8 padding;
struct gb_camera_stream_config_response config[0];
} __packed;

/* Greybus Camera Capture request payload - response has no payload */
struct gb_camera_capture_request {
__le32 request_id;
u8 streams;
u8 padding;
__u8 streams;
__u8 padding;
__le16 num_frames;
u8 settings[0];
__u8 settings[0];
} __packed;

/* Greybus Camera Flush response payload - request has no payload */
Expand All @@ -1168,7 +1168,7 @@ struct gb_camera_metadata_request {
__le16 frame_number;
__u8 stream;
__u8 padding;
u8 metadata[0];
__u8 metadata[0];
} __packed;

/* Lights */
Expand Down

0 comments on commit 8e77c83

Please sign in to comment.