lkml.org 
[lkml]   [2012]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] tpm_tis: Clean up after module_param cleanup
    Commit 90ab5ee94171b3e28de6bb42ee30b527014e0be7 changed the
    itpm module parameter from int to bool. Some other changes
    need to be done to clean up after this change.

    Signed-off-by: Stefan Berger <stefan@linux.vnet.ibm.com>
    Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
    Cc: Rusty Russell <rusty@rustcorp.com.au>

    ---
    drivers/char/tpm/tpm_tis.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    Index: linux-2.6/drivers/char/tpm/tpm_tis.c
    ===================================================================
    --- linux-2.6.orig/drivers/char/tpm/tpm_tis.c
    +++ linux-2.6/drivers/char/tpm/tpm_tis.c
    @@ -367,7 +367,7 @@ static int probe_itpm(struct tpm_chip *c
    0x00, 0x00, 0x00, 0xf1
    };
    size_t len = sizeof(cmd_getticks);
    - int rem_itpm = itpm;
    + bool rem_itpm = itpm;
    u16 vendor = ioread16(chip->vendor.iobase + TPM_DID_VID(0));

    /* probe only iTPMS */
    @@ -510,7 +510,7 @@ static int tpm_tis_init(struct device *d
    resource_size_t len, unsigned int irq)
    {
    u32 vendor, intfcaps, intmask;
    - int rc, i, irq_s, irq_e;
    + int rc, i, irq_s, irq_e, probe;
    struct tpm_chip *chip;

    if (!(chip = tpm_register_hardware(dev, &tpm_tis)))
    @@ -540,11 +540,12 @@ static int tpm_tis_init(struct device *d
    vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));

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

    if (itpm)


    \
     
     \ /
      Last update: 2012-01-20 19:03    [W:0.025 / U:0.012 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site