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=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 EAF2BC43613 for ; Mon, 24 Jun 2019 10:10:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA75920645 for ; Mon, 24 Jun 2019 10:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371003; bh=PK5p3ubr2f7HEy1uQTdhqt6uPKqR9XbpAmjOTvdzJsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wbkVMrxuFt2vs3Gl80meCUUuLT2fbzmuzvYHW+KVa4M9Eo25JFqdS0OONDPm+mJdP 49plVt/DmpTcaB0K6ukmKyeNWpNmr7CJ+haOo+/T2yy5UoScyp2Z0w61tsSw68aErs rhlzVwXO/4KDtGY9uTqiLYsx7OFC/mYVyq6Y5IyI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730382AbfFXKKC (ORCPT ); Mon, 24 Jun 2019 06:10:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730451AbfFXKI0 (ORCPT ); Mon, 24 Jun 2019 06:08:26 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 32F04208E3; Mon, 24 Jun 2019 10:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370905; bh=PK5p3ubr2f7HEy1uQTdhqt6uPKqR9XbpAmjOTvdzJsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eqLHZVELu5nCYt1ytQZxfqW2IFadQY6x9z6lO8rOdIT1PSNkgd4YPoUhKYlTq6VqI P6FDuixNmqhuYlyVCLjkYsZDnrMbLEwD6GTKJoJBBsAa0kFLYHhbVAiB6C3ogYHKSx fMGyn+3ef4aZ/gvdV623lrxVtBqirRJEiyAMs5aQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Wood , Wu Hao , Moritz Fischer , Alan Tull , Sasha Levin Subject: [PATCH 5.1 045/121] fpga: dfl: afu: Pass the correct device to dma_mapping_error() Date: Mon, 24 Jun 2019 17:56:17 +0800 Message-Id: <20190624092323.088891683@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 e18a786fc943..cd68002ac097 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