From 17e09a01b94f73043ea9ba7270a0503e486c4124 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 29 Jan 2013 22:02:02 +0100 Subject: [PATCH] --- yaml --- r: 352872 b: refs/heads/master c: 7333549bf4f345d338825dcd5b85400600e4cae7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_i2c_stm_st33.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b80144ac3dfd..032a7ee35d81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07d721688b8464662393f3b3136defbbad52be75 +refs/heads/master: 7333549bf4f345d338825dcd5b85400600e4cae7 diff --git a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c index b14c4b59958d..1f5f71e14abe 100644 --- a/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c +++ b/trunk/drivers/char/tpm/tpm_i2c_stm_st33.c @@ -96,16 +96,14 @@ enum tis_defaults { static int write8_reg(struct i2c_client *client, u8 tpm_register, u8 *tpm_data, u16 tpm_size) { - int value = 0; struct st33zp24_platform_data *pin_infos; pin_infos = client->dev.platform_data; 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], + return i2c_master_send(client, pin_infos->tpm_i2c_buffer[0], tpm_size + 1); - return value; } /* write8_reg() */ /*