From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC51BC31E4B for ; Fri, 14 Jun 2019 20:35:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B66482084D for ; Fri, 14 Jun 2019 20:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544558; bh=8R9UtRUVNBE2uIU81fb/ltKXzKjxnCFxSjBtWSZH3o0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tZiXQNwgNO2rDDOaMpB6Dt6dUBQkpHwsrheFqyZto8Q1usFHZOtAihsQ3A60E2jSs PKWlwDRvFBcQtiQikuXbkcnKiwakHUO6fFPNKYHUA53TM8sPi9uJWHyGq8KFzDTuaU /E3UEauCiIXSm0K8ZIasaP8gDpxxOOldLQ3Nlmgc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728199AbfFNUf6 (ORCPT ); Fri, 14 Jun 2019 16:35:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:52128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726082AbfFNU3u (ORCPT ); Fri, 14 Jun 2019 16:29:50 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6D2E21872; Fri, 14 Jun 2019 20:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544190; bh=8R9UtRUVNBE2uIU81fb/ltKXzKjxnCFxSjBtWSZH3o0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uyjacr4+JNUkqvxRjsRnDFq+zWmoCxKlTuBEvXw+canJyDJYfIf1oGxGIWepKjYX8 Vq6G0KX3Q1T7FZ+9kthOiEgoBFZl8wFSKsphnEIDymIRT7wT4pYRTohBlJ3JR0yxJ8 vmwc4SlFcQ9GhGdptvW60E01eCTmckfBCm2uNnjg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Scott Wood , Wu Hao , Moritz Fischer , Alan Tull , Greg Kroah-Hartman , Sasha Levin , linux-fpga@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 06/39] fpga: dfl: afu: Pass the correct device to dma_mapping_error() Date: Fri, 14 Jun 2019 16:29:11 -0400 Message-Id: <20190614202946.27385-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202946.27385-1-sashal@kernel.org> References: <20190614202946.27385-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Scott Wood [ Upstream commit 13069847a475b60069918dc9971f5adb42811ce3 ] dma_mapping_error() was being called on a different device struct than what was passed to map/unmap. Besides rendering the error checking ineffective, it caused a debug splat with CONFIG_DMA_API_DEBUG. Signed-off-by: Scott Wood Acked-by: Wu Hao Acked-by: Moritz Fischer Acked-by: Alan Tull Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/fpga/dfl-afu-dma-region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c index 0e81d33af856..c9a613dc9eb7 100644 --- a/drivers/fpga/dfl-afu-dma-region.c +++ b/drivers/fpga/dfl-afu-dma-region.c @@ -399,7 +399,7 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata, region->pages[0], 0, region->length, DMA_BIDIRECTIONAL); - if (dma_mapping_error(&pdata->dev->dev, region->iova)) { + if (dma_mapping_error(dfl_fpga_pdata_to_parent(pdata), region->iova)) { dev_err(&pdata->dev->dev, "failed to map for dma\n"); ret = -EFAULT; goto unpin_pages; -- 2.20.1