linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lars-Peter Clausen <lars@metafoo.de>,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Frank Schaefer <fschaefer.oss@googlemail.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the i2c tree
Date: Wed, 1 May 2013 13:27:46 +1000	[thread overview]
Message-ID: <20130501132746.099810489c0f9384d15f13e7@canb.auug.org.au> (raw)
In-Reply-To: <20130403121257.852f64242bff004461d8b081@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]

Hi all,

On Wed, 3 Apr 2013 12:12:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/pci/bt8xx/bttv-input.c between commit bf51a8c5e0b6 ("i2c:
> Ignore return value of i2c_del_adapter()") from the i2c tree and commit
> 457ba4ce4f43 ("[media] bttv: move fini_bttv_i2c() from bttv-input.c to
> bttv-i2c.c") from the v4l-dvb tree.
> 
> The latter moved the code that the former modified, so I added the
> following fix patch and can carry the fix as necessary (no action is
> required).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 3 Apr 2013 12:10:05 +1100
> Subject: [PATCH] i2c: fixup for code movement from bttv_input.c
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/pci/bt8xx/bttv-i2c.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
> index b7c52dc..d43911d 100644
> --- a/drivers/media/pci/bt8xx/bttv-i2c.c
> +++ b/drivers/media/pci/bt8xx/bttv-i2c.c
> @@ -397,8 +397,8 @@ int init_bttv_i2c(struct bttv *btv)
>  
>  int fini_bttv_i2c(struct bttv *btv)
>  {
> -	if (0 != btv->i2c_rc)
> -		return 0;
> +	if (btv->i2c_rc == 0)
> +		i2c_del_adapter(&btv->c.i2c_adap);
>  
> -	return i2c_del_adapter(&btv->c.i2c_adap);
> +	return 0;
>  }
> -- 
> 1.8.1

This fix up patch is now required when I merge the i2c tree (as Linus'
has merged the v4l-dvb stuff).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

      reply	other threads:[~2013-05-01  3:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-03  1:12 linux-next: manual merge of the v4l-dvb tree with the i2c tree Stephen Rothwell
2013-05-01  3:27 ` Stephen Rothwell [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=20130501132746.099810489c0f9384d15f13e7@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=fschaefer.oss@googlemail.com \
    --cc=lars@metafoo.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=wsa@the-dreams.de \
    /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).