linux-kernel - linux-next: manual merge of the v4l-dvb tree with the i2c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130403121257.852f64242bff004461d8b081@canb.auug.org.au>
Date:	Wed, 3 Apr 2013 12:12:57 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lars-Peter Clausen <lars@...afoo.de>,
	Wolfram Sang <wsa@...-dreams.de>,
	Frank Schaefer <fschaefer.oss@...glemail.com>
Subject: linux-next: manual merge of the v4l-dvb tree with the i2c tree

Hi Mauro,

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@...b.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@...b.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

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

Content of type "application/pgp-signature" skipped