diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /drivers/char/tpm/tpm_tis.c | |
| parent | 0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff) | |
| parent | ba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/char/tpm/tpm_tis.c')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index f621168f38a..8ea70625f7e 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -457,10 +457,6 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, } vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0)); - if ((vendor & 0xFFFF) == 0xFFFF) { - rc = -ENODEV; - goto out_err; - } /* Default timeouts */ chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT); |