summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King2017-08-16 19:21:40 +0200
committerGreg Kroah-Hartman2017-08-16 20:12:06 +0200
commit47f078339be902e97d0ad828ca1d614a5a95334b (patch)
tree1f7f121d3a8bc58a883f8718a580c153d1a361ee
parentLinux 4.13-rc5 (diff)
downloadkernel-qcow2-linux-47f078339be902e97d0ad828ca1d614a5a95334b.tar.gz
kernel-qcow2-linux-47f078339be902e97d0ad828ca1d614a5a95334b.tar.xz
kernel-qcow2-linux-47f078339be902e97d0ad828ca1d614a5a95334b.zip
Revert "staging: fsl-mc: be consistent when checking strcmp() return"
The previous fix removed the equal to zero comparisons by the strcmps and now the function always returns true. Revert this change to restore the original correctly functioning code. Detected by CoverityScan, CID#1452267 ("Constant expression result") This reverts commit b93ad9a067e1515af42da7d56bc61f1a25075f94. Fixes: b93ad9a067e1 ("staging: fsl-mc: be consistent when checking strcmp() return") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/fsl-mc/bus/fsl-mc-allocator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
index b37a6f48225f..8ea3920400a0 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
@@ -16,9 +16,9 @@
static bool __must_check fsl_mc_is_allocatable(const char *obj_type)
{
- return strcmp(obj_type, "dpbp") ||
- strcmp(obj_type, "dpmcp") ||
- strcmp(obj_type, "dpcon");
+ return strcmp(obj_type, "dpbp") == 0 ||
+ strcmp(obj_type, "dpmcp") == 0 ||
+ strcmp(obj_type, "dpcon") == 0;
}
/**