diff --git a/[refs] b/[refs] index 28e15838c986..73572294b1fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 617aa39639943626fa262757d176be413c54571b +refs/heads/master: 92eb40134332eba28cde3c2aecdb48a561c437b1 diff --git a/trunk/drivers/staging/mei/mei_dev.h b/trunk/drivers/staging/mei/mei_dev.h index d7bc10c612be..2e1107762efd 100644 --- a/trunk/drivers/staging/mei/mei_dev.h +++ b/trunk/drivers/staging/mei/mei_dev.h @@ -356,7 +356,7 @@ int mei_find_me_client_index(const struct mei_device *dev, uuid_le cuuid); * @dev: the device structure * @offset: offset from which to read the data * - * returns the byte read. + * returns register value (u32) */ static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset) { @@ -368,7 +368,7 @@ static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset) * * @dev: the device structure * @offset: offset from which to write the data - * @value: the byte to write + * @value: register value to write (u32) */ static inline void mei_reg_write(struct mei_device *dev, unsigned long offset, u32 value)