From patchwork Sun Sep 20 08:30:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 67116 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kJulc-00GwMj-Sq; Sun, 20 Sep 2020 08:32:19 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726379AbgITIi1 (ORCPT + 1 other); Sun, 20 Sep 2020 04:38:27 -0400 Received: from jabberwock.ucw.cz ([46.255.230.98]:59818 "EHLO jabberwock.ucw.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726262AbgITIi0 (ORCPT ); Sun, 20 Sep 2020 04:38:26 -0400 X-Greylist: delayed 476 seconds by postgrey-1.27 at vger.kernel.org; Sun, 20 Sep 2020 04:38:25 EDT Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id 7E5291C0B96; Sun, 20 Sep 2020 10:30:26 +0200 (CEST) Date: Sun, 20 Sep 2020 10:30:25 +0200 From: Pavel Machek To: stable@vger.kernel.org, Greg KH , prabhakar.csengg@gmail.com, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH 4.19] media: da_vinci: fix code duplication due to missmerge Message-ID: <20200920083025.GA991@amd> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.4 (--) X-LSpam-Report: No, score=-2.4 required=5.0 tests=BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no I'm not sure what went wrong there, but same block of code is there, twice. Probably some kind of mis-merge. Fix it. Signed-off-by: Pavel Machek (CIP) --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1633,11 +1633,6 @@ static __init int vpif_probe(struct platform_device *pdev) return -EINVAL; } - if (!pdev->dev.platform_data) { - dev_warn(&pdev->dev, "Missing platform data. Giving up.\n"); - return -EINVAL; - } - vpif_dev = &pdev->dev; err = initialize_vpif();