---

yaml --- r: 352869 b: refs/heads/master c: 6429891 h: refs/heads/master i: 352867: 52b0d6d v: v3
git-mirror · Feb 5, 2013 · be55ff4 · be55ff4
1 parent 17e9119
commit be55ff4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d479042c82941772cb1c003b46707d55185a49f6
+refs/heads/master: 64298919ad034aa07a6ec85b82e5c8861e364ae5
diff --git a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c
@@ -96,15 +96,13 @@ enum tis_defaults {
 static int write8_reg(struct i2c_client *client, u8 tpm_register,
 		      u8 *tpm_data, u16 tpm_size)
 {
-	u8 data;
 	int value = 0;
 	struct st33zp24_platform_data *pin_infos;
 
 	pin_infos = client->dev.platform_data;
 
-	data = tpm_register;
-	memcpy(pin_infos->tpm_i2c_buffer[0], &data, sizeof(data));
-	memcpy(pin_infos->tpm_i2c_buffer[0] + 1, tpm_data, tpm_size);
+	pin_infos->tpm_i2c_buffer[0][0] = tpm_register;
+	memcpy(&pin_infos->tpm_i2c_buffer[0][1], tpm_data, tpm_size);
 	value = i2c_master_send(client, pin_infos->tpm_i2c_buffer[0],
 				tpm_size + 1);
 	return value;