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: 263776 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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_SANE_1 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 131FFC43466 for ; Sun, 20 Sep 2020 08:30:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFDC820897 for ; Sun, 20 Sep 2020 08:30:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726245AbgITIab (ORCPT ); Sun, 20 Sep 2020 04:30:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726216AbgITIab (ORCPT ); Sun, 20 Sep 2020 04:30:31 -0400 X-Greylist: delayed 104 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 20 Sep 2020 01:30:30 PDT Received: from jabberwock.ucw.cz (jabberwock.ucw.cz [IPv6:2a00:da80:fff0:2::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2B9EC061755 for ; Sun, 20 Sep 2020 01:30:30 -0700 (PDT) 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: stable@vger.kernel.org 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();