From: Antti Palosaari <crope@iki.fi>
To: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: Re: [PATCH] si2168: Fix a badly solved merge conflict
Date: Tue, 22 Jul 2014 22:33:03 +0300 [thread overview]
Message-ID: <53CEBC6F.4050605@iki.fi> (raw)
In-Reply-To: <1406057133-7657-1-git-send-email-m.chehab@samsung.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Could you merge it directly from patchwork.
regards
Antti
On 07/22/2014 10:25 PM, Mauro Carvalho Chehab wrote:
> changeset a733291d6934 didn't merge the fixes well. It ended by
> restoring some bad logic removed there.
>
> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
> ---
> drivers/media/dvb-frontends/si2168.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
> index 842c4a555d01..02127613eeff 100644
> --- a/drivers/media/dvb-frontends/si2168.c
> +++ b/drivers/media/dvb-frontends/si2168.c
> @@ -381,20 +381,6 @@ static int si2168_init(struct dvb_frontend *fe)
> if (ret)
> goto err;
>
> - cmd.args[0] = 0x05;
> - cmd.args[1] = 0x00;
> - cmd.args[2] = 0xaa;
> - cmd.args[3] = 0x4d;
> - cmd.args[4] = 0x56;
> - cmd.args[5] = 0x40;
> - cmd.args[6] = 0x00;
> - cmd.args[7] = 0x00;
> - cmd.wlen = 8;
> - cmd.rlen = 1;
> - ret = si2168_cmd_execute(s, &cmd);
> - if (ret)
> - goto err;
> -
> chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
> cmd.args[4] << 0;
>
>
--
http://palosaari.fi/
prev parent reply other threads:[~2014-07-22 19:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-22 19:25 [PATCH] si2168: Fix a badly solved merge conflict Mauro Carvalho Chehab
2014-07-22 19:33 ` Antti Palosaari [this message]
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=53CEBC6F.4050605@iki.fi \
--to=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=mchehab@infradead.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).