[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>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index ad8ffe49256f..1ab0896070be 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -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;
         }