hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: Jeff Garzik <jeff@garzik.org>
Acked-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Garzik 2006-10-11 01:21:51 -07:00 committed by Linus Torvalds
parent 5a2b4062f5
commit f33d9bd504
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/char/tpm/tpm.c
View File

@ -1153,7 +1153,14 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
spin_unlock(&driver_lock); 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); chip->bios_dir = tpm_bios_log_setup(devname);

10
drivers/char/tpm/tpm_atmel.c
View File

@ -184,7 +184,9 @@ static int __init init_atmel(void)
unsigned long base; unsigned long base;
struct tpm_chip *chip; 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) { if ((iobase = atmel_get_base_addr(&base, &region_size)) == NULL) {
rc = -ENODEV; rc = -ENODEV;
@ -195,10 +197,8 @@ static int __init init_atmel(void)
(atmel_request_region (atmel_request_region
(tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1; (tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1;
pdev = platform_device_register_simple("tpm_atmel", -1, NULL, 0);
if (IS_ERR if (IS_ERR(pdev)) {
(pdev =
platform_device_register_simple("tpm_atmel", -1, NULL, 0))) {
rc = PTR_ERR(pdev); rc = PTR_ERR(pdev);
goto err_rel_reg; goto err_rel_reg;
} }

6
drivers/char/tpm/tpm_nsc.c
View File

@ -284,7 +284,7 @@ static struct device_driver nsc_drv = {
static int __init init_nsc(void) static int __init init_nsc(void)
{ {
int rc = 0; int rc = 0;
int lo, hi; int lo, hi, err;
int nscAddrBase = TPM_ADDR; int nscAddrBase = TPM_ADDR;
struct tpm_chip *chip; struct tpm_chip *chip;
unsigned long base; unsigned long base;
@ -297,7 +297,9 @@ static int __init init_nsc(void)
return -ENODEV; return -ENODEV;
} }
driver_register(&nsc_drv); err = driver_register(&nsc_drv);
if (err)
return err;
hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI); hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);
lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO); lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);