From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: sprd: fix an NULL vs IS_ERR() bug From: Dan Carpenter Message-Id: <20180516084807.GA23043@mwanda> Date: Wed, 16 May 2018 11:48:07 +0300 To: Dan Williams , Baolin Wang Cc: Vinod Koul , Orson Zhai , Chunyan Zhang , dmaengine@vger.kernel.org, kernel-janitors@vger.kernel.org List-ID: V2UgcmVjZW50bHkgY2xlYW5lZCB0aGlzIGNvZGUgdXAgYnV0IHdlIG5lZWQgdG8gdXBkYXRlIHRo ZSBlcnJvcgpoYW5kbGluZyBhcyB3ZWxsLiAgVGhlIGRldm1faW9yZW1hcF9yZXNvdXJjZSgpIHJl dHVybnMgZXJyb3IgcG9pbnRlcnMgb24KZXJyb3IsIG5ldmVyIE5VTEwuCgpGaXhlczogZTdmMDYz YWUxYTMxICgiZG1hZW5naW5lOiBzcHJkOiBVc2UgZGV2bV9pb3JlbWFwX3Jlc291cmNlKCkgdG8g bWFwIG1lbW9yeSIpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJA b3JhY2xlLmNvbT4KLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBs aW5lICJ1bnN1YnNjcmliZSBkbWFlbmdpbmUiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBt YWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92 Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv ZG1hL3NwcmQtZG1hLmMgYi9kcml2ZXJzL2RtYS9zcHJkLWRtYS5jCmluZGV4IGU3MTVkMDdhYTYz Mi4uMzZkZjNiMDk2YmJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS9zcHJkLWRtYS5jCisrKyBi L2RyaXZlcnMvZG1hL3NwcmQtZG1hLmMKQEAgLTgwOCw4ICs4MDgsOCBAQCBzdGF0aWMgaW50IHNw cmRfZG1hX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAKIAlyZXMgPSBwbGF0 Zm9ybV9nZXRfcmVzb3VyY2UocGRldiwgSU9SRVNPVVJDRV9NRU0sIDApOwogCXNkZXYtPmdsYl9i YXNlID0gZGV2bV9pb3JlbWFwX3Jlc291cmNlKCZwZGV2LT5kZXYsIHJlcyk7Ci0JaWYgKCFzZGV2 LT5nbGJfYmFzZSkKLQkJcmV0dXJuIC1FTk9NRU07CisJaWYgKElTX0VSUihzZGV2LT5nbGJfYmFz ZSkpCisJCXJldHVybiBQVFJfRVJSKHNkZXYtPmdsYl9iYXNlKTsKIAogCWRtYV9jYXBfc2V0KERN QV9NRU1DUFksIHNkZXYtPmRtYV9kZXYuY2FwX21hc2spOwogCXNkZXYtPnRvdGFsX2NobnMgPSBj aG5fY291bnQ7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 16 May 2018 08:48:07 +0000 Subject: [PATCH] dmaengine: sprd: fix an NULL vs IS_ERR() bug Message-Id: <20180516084807.GA23043@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Williams , Baolin Wang Cc: Vinod Koul , Orson Zhai , Chunyan Zhang , dmaengine@vger.kernel.org, kernel-janitors@vger.kernel.org We recently cleaned this code up but we need to update the error handling as well. The devm_ioremap_resource() returns error pointers on error, never NULL. Fixes: e7f063ae1a31 ("dmaengine: sprd: Use devm_ioremap_resource() to map memory") Signed-off-by: Dan Carpenter diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index e715d07aa632..36df3b096bbc 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -808,8 +808,8 @@ static int sprd_dma_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sdev->glb_base = devm_ioremap_resource(&pdev->dev, res); - if (!sdev->glb_base) - return -ENOMEM; + if (IS_ERR(sdev->glb_base)) + return PTR_ERR(sdev->glb_base); dma_cap_set(DMA_MEMCPY, sdev->dma_dev.cap_mask); sdev->total_chns = chn_count;