diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 15:26:48 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 15:26:48 +0200 |
commit | 8439a69e72888daa7d2667980efaf20d8bbe7b20 (patch) | |
tree | ff262847ff4f6797c9df882379ea0498a8822a18 /drivers/staging/fsl-mc/bus | |
parent | b9920ca3b53728aaa836f138f74ebb37776b9f57 (diff) | |
parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
download | op-kernel-dev-8439a69e72888daa7d2667980efaf20d8bbe7b20.zip op-kernel-dev-8439a69e72888daa7d2667980efaf20d8bbe7b20.tar.gz |
Merge 4.13-rc7 into staging-next
We want the staging and iio fixes in here to handle the merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fsl-mc/bus')
-rw-r--r-- | drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 6 |
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 b37a6f4..8ea3920 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; } /** |