Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352855
b: refs/heads/master
c: 7324969
h: refs/heads/master
i:
  352853: 5498315
  352851: 736ab5e
  352847: e9ffb29
v: v3
  • Loading branch information
Peter Huewe authored and Kent Yoder committed Feb 5, 2013
1 parent 0a1356e commit 845cd24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 348df8db301d9fa01fb51e5eaca1e9f3b27bd4c8
refs/heads/master: 73249695f0cb10bb9fc8b294f3f8c4b001889e42
12 changes: 6 additions & 6 deletions trunk/drivers/char/tpm/tpm_tis.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static int probe_itpm(struct tpm_chip *chip)
if (vendor != TPM_VID_INTEL)
return 0;

itpm = 0;
itpm = false;

rc = tpm_tis_send_data(chip, cmd_getticks, len);
if (rc == 0)
Expand All @@ -383,7 +383,7 @@ static int probe_itpm(struct tpm_chip *chip)
tpm_tis_ready(chip);
release_locality(chip, chip->vendor.locality, 0);

itpm = 1;
itpm = true;

rc = tpm_tis_send_data(chip, cmd_getticks, len);
if (rc == 0) {
Expand Down Expand Up @@ -502,7 +502,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id)
return IRQ_HANDLED;
}

static bool interrupts = 1;
static bool interrupts = true;
module_param(interrupts, bool, 0444);
MODULE_PARM_DESC(interrupts, "Enable interrupts");

Expand Down Expand Up @@ -545,7 +545,7 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
rc = -ENODEV;
goto out_err;
}
itpm = (probe == 0) ? 0 : 1;
itpm = !!probe;
}

if (itpm)
Expand Down Expand Up @@ -741,10 +741,10 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
if (pnp_irq_valid(pnp_dev, 0))
irq = pnp_irq(pnp_dev, 0);
else
interrupts = 0;
interrupts = false;

if (is_itpm(pnp_dev))
itpm = 1;
itpm = true;

return tpm_tis_init(&pnp_dev->dev, start, len, irq);
}
Expand Down

0 comments on commit 845cd24

Please sign in to comment.