diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-29 18:40:30 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-29 18:40:30 +0200 |
| commit | 782935d12ec2c942a793e90da2240093272d24ba (patch) | |
| tree | f88729049d9e6a76728e273b5d53a1d537027b4f /drivers/soc/qcom/cmd-db.c | |
| parent | soc: add aspeed folder and misc drivers (diff) | |
| parent | MAINTAINERS: Update email for Qualcomm SoC maintainer (diff) | |
| download | linux-782935d12ec2c942a793e90da2240093272d24ba.tar.xz linux-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/cmd-db.c')
| -rw-r--r-- | drivers/soc/qcom/cmd-db.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index c701b3b010f1..f6c3d17b05c7 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -248,8 +248,8 @@ static int cmd_db_dev_probe(struct platform_device *pdev) } cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WB); - if (IS_ERR_OR_NULL(cmd_db_header)) { - ret = PTR_ERR(cmd_db_header); + if (!cmd_db_header) { + ret = -ENOMEM; cmd_db_header = NULL; return ret; } |