aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-06-15 10:23:24 -0400
committerPeter Huewe <peterhuewe@gmx.de>2013-06-27 18:47:43 -0400
commit640843ada1236da228121bb139829c657ce9993f (patch)
tree6bf07055c0144c32b49ee8bc743f32f5a4780900
parent9b97b6cdd420cd62dae972eafaae7494a7670607 (diff)
tpm: tpm_i2c_infinion: Don't modify i2c_client->driver
The I2C client driver is not supposed to modify the client's driver pointer, this is handled by the I2C core. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
-rw-r--r--drivers/char/tpm/tpm_i2c_infineon.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 37d5dcc10ea7..dbc70429c6ff 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -74,7 +74,6 @@ struct tpm_inf_dev {
74}; 74};
75 75
76static struct tpm_inf_dev tpm_dev; 76static struct tpm_inf_dev tpm_dev;
77static struct i2c_driver tpm_tis_i2c_driver;
78 77
79/* 78/*
80 * iic_tpm_read() - read from TPM register 79 * iic_tpm_read() - read from TPM register
@@ -744,11 +743,9 @@ static int tpm_tis_i2c_probe(struct i2c_client *client,
744 return -ENODEV; 743 return -ENODEV;
745 } 744 }
746 745
747 client->driver = &tpm_tis_i2c_driver;
748 tpm_dev.client = client; 746 tpm_dev.client = client;
749 rc = tpm_tis_i2c_init(&client->dev); 747 rc = tpm_tis_i2c_init(&client->dev);
750 if (rc != 0) { 748 if (rc != 0) {
751 client->driver = NULL;
752 tpm_dev.client = NULL; 749 tpm_dev.client = NULL;
753 rc = -ENODEV; 750 rc = -ENODEV;
754 } 751 }