Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f33d9bd5 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

[PATCH] tpm: fix error handling 



- handle sysfs error
- handle driver model errors
- de-obfuscate platform_device_register_simple() call, which included an
  assignment in between two function calls, in the same C statement.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Acked-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a2b4062

drivers/char/tpm/tpm.c

+8 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,14 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend 


	spin_unlock(&driver_lock);



	sysfs_create_group(&dev->kobj, chip->vendor.attr_group);

	if (sysfs_create_group(&dev->kobj, chip->vendor.attr_group)) {

		list_del(&chip->list);

		put_device(dev);

		clear_bit(chip->dev_num, dev_mask);

		kfree(chip);

		kfree(devname);

		return NULL;

	}



	chip->bios_dir = tpm_bios_log_setup(devname);

drivers/char/tpm/tpm_atmel.c

+5 −5
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ static int __init init_atmel(void) 
	unsigned long base;

	struct  tpm_chip *chip;



	driver_register(&atml_drv);

	rc = driver_register(&atml_drv);

	if (rc)

		return rc;



	if ((iobase = atmel_get_base_addr(&base, &region_size)) == NULL) {

		rc = -ENODEV;
@@ -195,10 +197,8 @@ static int __init init_atmel(void) 
	    (atmel_request_region

	     (tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1;





	if (IS_ERR

	    (pdev =

	     platform_device_register_simple("tpm_atmel", -1, NULL, 0))) {

	pdev = platform_device_register_simple("tpm_atmel", -1, NULL, 0);

	if (IS_ERR(pdev)) {

		rc = PTR_ERR(pdev);

		goto err_rel_reg;

	}

drivers/char/tpm/tpm_nsc.c

+4 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static struct device_driver nsc_drv = { 
static int __init init_nsc(void)

{

	int rc = 0;

	int lo, hi;

	int lo, hi, err;

	int nscAddrBase = TPM_ADDR;

	struct tpm_chip *chip;

	unsigned long base;
@@ -297,7 +297,9 @@ static int __init init_nsc(void) 
			return -ENODEV;

	}



	driver_register(&nsc_drv);

	err = driver_register(&nsc_drv);

	if (err)

		return err;



	hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);

	lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);