lkml.org 
[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] TPM: handle errors from probe_itpm()
We recently made itpm a bool in linux-next and it broke the error
handling here. This patch also preserves the return codes from
probe_itpm() instead of always returning -ENODEV.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index a174862..08c6a07 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -538,11 +538,11 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));

if (!itpm) {
- itpm = probe_itpm(chip);
- if (itpm < 0) {
- rc = -ENODEV;
+ rc = probe_itpm(chip);
+ if (rc < 0)
goto out_err;
- }
+ itpm = rc;
+ rc = 0;
}

if (itpm)

\
 
 \ /
  Last update: 2012-01-03 14:21    [from the cache]
©2003-2011 Jasper Spaans