summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-04-24 14:36:02 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2017-06-22 23:59:01 +0200
commite1038535106e73e48204ec3bfe5a428fe6cb35cb (patch)
tree946b3da460748f407be8bfd4592a62f36a3d6513 /drivers/nfc
parent1e4179bc71aeaba81bcf42f5f23a9a3bb1219814 (diff)
downloadlinux-e1038535106e73e48204ec3bfe5a428fe6cb35cb.tar.gz
linux-e1038535106e73e48204ec3bfe5a428fe6cb35cb.tar.bz2
linux-e1038535106e73e48204ec3bfe5a428fe6cb35cb.zip
NFC: trf7970a: fix check of clock frequencies, use && instead of ||
The "or" condition (clk_freq != TRF7970A_27MHZ_CLOCK_FREQUENCY) || (clk_freq != TRF7970A_13MHZ_CLOCK_FREQUE) will always be true because clk_freq cannot be equal to two different values at the same time. Use the && operator instead of || to fix this. Detected by CoverityScan, CID#1430468 ("Constant expression result") Fixes: 837eb4d21ecde7 ("NFC: trf7970a: add device tree option for 27MHz clock") Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Geoff Lansberry <geoff@kuvee.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/trf7970a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 28b942ea15fb..914463a0e7b3 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -2059,7 +2059,7 @@ static int trf7970a_probe(struct spi_device *spi)
}
of_property_read_u32(np, "clock-frequency", &clk_freq);
- if ((clk_freq != TRF7970A_27MHZ_CLOCK_FREQUENCY) ||
+ if ((clk_freq != TRF7970A_27MHZ_CLOCK_FREQUENCY) &&
(clk_freq != TRF7970A_13MHZ_CLOCK_FREQUENCY)) {
dev_err(trf->dev,
"clock-frequency (%u Hz) unsupported\n", clk_freq);