Commit 2b17e90d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-v6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm fixes from Jarkko Sakkinen:
 "I picked up three small scale updates that I think would improve the
  quality of the release"

* tag 'tpmdd-v6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm_tis: Explicitly check for error code
  tpm: Switch i2c drivers back to use .probe()
  security: keys: perform capable check only on privileged operations
parents f837f0a3 513253f8

drivers/char/tpm/st33zp24/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct i2c_driver st33zp24_i2c_driver = { 
		.of_match_table = of_match_ptr(of_st33zp24_i2c_match),

		.acpi_match_table = ACPI_PTR(st33zp24_i2c_acpi_match),

	},

	.probe_new = st33zp24_i2c_probe,

	.probe = st33zp24_i2c_probe,

	.remove = st33zp24_i2c_remove,

	.id_table = st33zp24_i2c_id

};

drivers/char/tpm/tpm_i2c_atmel.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(i2c_atmel_pm_ops, tpm_pm_suspend, tpm_pm_resume); 


static struct i2c_driver i2c_atmel_driver = {

	.id_table = i2c_atmel_id,

	.probe_new = i2c_atmel_probe,

	.probe = i2c_atmel_probe,

	.remove = i2c_atmel_remove,

	.driver = {

		.name = I2C_DRIVER_NAME,

drivers/char/tpm/tpm_i2c_infineon.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static void tpm_tis_i2c_remove(struct i2c_client *client) 


static struct i2c_driver tpm_tis_i2c_driver = {

	.id_table = tpm_tis_i2c_table,

	.probe_new = tpm_tis_i2c_probe,

	.probe = tpm_tis_i2c_probe,

	.remove = tpm_tis_i2c_remove,

	.driver = {

		   .name = "tpm_i2c_infineon",

drivers/char/tpm/tpm_i2c_nuvoton.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static SIMPLE_DEV_PM_OPS(i2c_nuvoton_pm_ops, tpm_pm_suspend, tpm_pm_resume); 


static struct i2c_driver i2c_nuvoton_driver = {

	.id_table = i2c_nuvoton_id,

	.probe_new = i2c_nuvoton_probe,

	.probe = i2c_nuvoton_probe,

	.remove = i2c_nuvoton_remove,

	.driver = {

		.name = "tpm_i2c_nuvoton",

drivers/char/tpm/tpm_tis_core.c

+7 −2
Original line number Diff line number Diff line
@@ -366,8 +366,13 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
		goto out;

	}



	size += recv_data(chip, &buf[TPM_HEADER_SIZE],

	rc = recv_data(chip, &buf[TPM_HEADER_SIZE],

		       expected - TPM_HEADER_SIZE);

	if (rc < 0) {

		size = rc;

		goto out;

	}

	size += rc;

	if (size < expected) {

		dev_err(&chip->dev, "Unable to read remainder of result\n");

		size = -ETIME;