From be55ff426143d29474e5e57c09efea71eeebf6d7 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 29 Jan 2013 22:01:59 +0100 Subject: [PATCH] --- yaml --- r: 352869 b: refs/heads/master c: 64298919ad034aa07a6ec85b82e5c8861e364ae5 h: refs/heads/master i: 352867: 52b0d6d8ba79dc0a3927601c9e1db2240ead02a8 v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_i2c_stm_st33.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8607b7798f2e..584c2ced2a51 100644 --- 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 index 8c60d33d116c..16f1f785c0b9 100644 --- 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;