From: Pavel Machek <pavel@ucw.cz>
To: stable@vger.kernel.org, Greg KH <greg@kroah.com>,
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
Date: Sun, 20 Sep 2020 10:30:25 +0200 [thread overview]
Message-ID: <20200920083025.GA991@amd> (raw)
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
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) <pavel@denx.de>
--- 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();
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
reply other threads:[~2020-09-20 8:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200920083025.GA991@amd \
--to=pavel@ucw.cz \
--cc=greg@kroah.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=prabhakar.csengg@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).