Re: [PATCH] si2168: Fix a badly solved merge conflict

[Antti Palosaari <crope@iki.fi>]

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/