diff options
| -rw-r--r-- | drivers/staging/greybus/greybus_manifest.h | 3 | ||||
| -rw-r--r-- | drivers/staging/greybus/manifest.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h index 90965766dceb..1fb01319b9a3 100644 --- a/drivers/staging/greybus/greybus_manifest.h +++ b/drivers/staging/greybus/greybus_manifest.h @@ -82,12 +82,9 @@ struct greybus_descriptor_string { * *not* the functions within it. */ struct greybus_descriptor_interface { - __le16 vendor; - __le16 product; __le16 version; // TODO - remove after Dec demo. __u8 vendor_stringid; __u8 product_stringid; - __le64 unique_id; } __packed; /* diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c index 2346ead2a977..de234d2386f6 100644 --- a/drivers/staging/greybus/manifest.c +++ b/drivers/staging/greybus/manifest.c @@ -304,9 +304,11 @@ static bool gb_manifest_parse_interface(struct gb_interface *intf, goto out_free_vendor_string; } - intf->vendor = le16_to_cpu(desc_intf->vendor); - intf->product = le16_to_cpu(desc_intf->product); - intf->unique_id = le64_to_cpu(desc_intf->unique_id); + // FIXME + // Vendor, Product and Unique id must come via control protocol + intf->vendor = 0xffff; + intf->product = 0x0001; + intf->unique_id = 0; /* Release the interface descriptor, now that we're done with it */ release_manifest_descriptor(interface_desc); |