diff options
author | Olof Johansson <olof@lixom.net> | 2019-04-29 09:40:30 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-04-29 09:40:30 -0700 |
commit | 782935d12ec2c942a793e90da2240093272d24ba (patch) | |
tree | f88729049d9e6a76728e273b5d53a1d537027b4f /drivers/soc/qcom/rpmh-rsc.c | |
parent | 524feb799408e5d45c6aa82763a9f52489d1e19f (diff) | |
parent | 2616b3deaf9c5db18f78689968d4c998bda8a983 (diff) | |
download | linux-stable-782935d12ec2c942a793e90da2240093272d24ba.tar.gz linux-stable-782935d12ec2c942a793e90da2240093272d24ba.tar.bz2 linux-stable-782935d12ec2c942a793e90da2240093272d24ba.zip |
Merge tag 'qcom-drivers-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/drivers
Qualcomm ARM Based Driver Updates for v5.2
* Update MAINTAINERS for Andy Gross's new email address
* Add support for mmap in RMTFS
* Fixup for QMI to change txn wait to non-interruptible
* Fixup for error code in probe of cmd-db
* Fixup for slot number check in RMPH-RSC
* tag 'qcom-drivers-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
MAINTAINERS: Update email for Qualcomm SoC maintainer
drivers: soc: qcom: rpmh-rsc: Correct check for slot number
soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe()
soc: qcom: qmi: Change txn wait to non-interruptible
soc: qcom: rmtfs: Add support for mmap functionality
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/qcom/rpmh-rsc.c')
-rw-r--r-- | drivers/soc/qcom/rpmh-rsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index 75bd9a83aef0..e278fc11fe5c 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -459,7 +459,7 @@ static int find_slots(struct tcs_group *tcs, const struct tcs_request *msg, do { slot = bitmap_find_next_zero_area(tcs->slots, MAX_TCS_SLOTS, i, msg->num_cmds, 0); - if (slot == tcs->num_tcs * tcs->ncpt) + if (slot >= tcs->num_tcs * tcs->ncpt) return -ENOMEM; i += tcs->ncpt; } while (slot + msg->num_cmds - 1 >= i); |