From patchwork Tue Jun 23 19:51:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191621 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1375918ecs; Tue, 23 Jun 2020 14:40:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7MI+VoKyE5TxgpgVu596DYCawgqH5InVHQzBFWpIAxgb4hkUrdrgUTs9eFzTX0gjOGbbS X-Received: by 2002:a17:906:4c42:: with SMTP id d2mr22975909ejw.474.1592948456370; Tue, 23 Jun 2020 14:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948456; cv=none; d=google.com; s=arc-20160816; b=k40heAPXwcDSfDbBVaE5U5Ins+XOsiKpWUVM1DFkZeQJtJO+kkkrDSucIW8n4epp2N 9rtn8mAObN/6TMJ/62RHd8VRjQ3Lu+rZXFedngcivKagkBCGW/WAg9CfASXzeKHUBaCW 8SKro+/M33l7GxfRyljgOkIrdfepC8Xpi2TYUcvtpHUekHyHZ15FbKmuMRt0OgxH/tfD 8mRNOpWmZLu0FS0C6R7zBj+bsJbM4bVsJlBiV4PxlgtwBTVdoIMeT9uX+pop0nK11YC7 sbHSR22bWBASFmy38XSGv6gsi+rb7eKnbyQOmB25gFyLLXrZrYMmWsANm1Ycid+WBn1a SVcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DTZcktFmVF0Skcath9IDnOM4KtiM6YWTahCHh0XZM8g=; b=FN4WzVfgQdBezcblaDfVbmdjN3H5lmfHt3J9jXsMzw01tGPdsSWF0f3yY8c2lIHp/B ZBSkXnH0iU50/wlOlyKOCyIKWvGNS8QLYNG/boU4Sx6HM0O2CHnuILeqWngY8NmW5Rbz QBZ2JNXYauhLEKAi5UH4savlFBkg4nT8UKDjGWX6Jr6ANPmMA5s/F0i1bYujB+b9vHxg PqbKe59OrrEKgyMuG70hCMtcrE3ymQNlLURZTeooN6pT7MtZ0twXG/INJjuOnzLZeodQ mPO/jX3MygSEJS1gWSWJG4WslaNXx2vsI/HjSThHRCaFrbojbZpg4UYeM2IQp2hFMcL3 2bXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pRxz3GjG; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lj21si11938675ejb.324.2020.06.23.14.40.55; Tue, 23 Jun 2020 14:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pRxz3GjG; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388136AbgFWVkx (ORCPT + 15 others); Tue, 23 Jun 2020 17:40:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:46698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388488AbgFWUGd (ORCPT ); Tue, 23 Jun 2020 16:06:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 EED6820EDD; Tue, 23 Jun 2020 20:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942793; bh=qQV8XaSV3qftiuUV2eui7l31ooADsetal0aMx7Owrbs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pRxz3GjGEn821Lb+VlzLHHwD1mkQfoR0LDFtOkTxfe0fH1RcD4fjJ4OKGR2IV99Si svWtdCdYsIZYY89hY6fR3TB/eZxbwrw9a6PCGqeJjWSy0sNTws3TRk2lJ6dFN1d8Df J24/FNwF9p26Q6Mkry951Fk/+1fq48VDgG3F3UWw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tomi Valkeinen , Ulf Hansson , Marek Szyprowski , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.7 107/477] media: s5p-mfc: Properly handle dma_parms for the allocated devices Date: Tue, 23 Jun 2020 21:51:44 +0200 Message-Id: <20200623195412.652180204@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit cc8c0363ddce6308168d8223378ca884c213f280 ] Commit 9495b7e92f71 ("driver core: platform: Initialize dma_parms for platform devices") in v5.7-rc5 added allocation of dma_parms structure to all platform devices. Then vb2_dma_contig_set_max_seg_size() have been changed not to allocate dma_parms structure and rely on the one allocated by the device core. Lets allocate the needed structure also for the devices created for the 2 MFC device memory ports. Reported-by: Tomi Valkeinen Suggested-by: Ulf Hansson Fixes: 9495b7e92f71 ("driver core: platform: Initialize dma_parms for platform devices") Signed-off-by: Marek Szyprowski Reviewed-by: Ulf Hansson Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 5c2a23b953a41..eba2b9f040df0 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1089,6 +1089,10 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, child->coherent_dma_mask = dev->coherent_dma_mask; child->dma_mask = dev->dma_mask; child->release = s5p_mfc_memdev_release; + child->dma_parms = devm_kzalloc(dev, sizeof(*child->dma_parms), + GFP_KERNEL); + if (!child->dma_parms) + goto err; /* * The memdevs are not proper OF platform devices, so in order for them @@ -1104,7 +1108,7 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, return child; device_del(child); } - +err: put_device(child); return NULL; }