linux-kernel - linux-next: manual merge of the akpm tree with the char-misc 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>] [day] [month] [year] [list]

Date:	Mon, 23 Jun 2014 14:33:04 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Fjodor Schelichow <fjodor.schelichow@...mail.com>,
	Levente Kurusa <levex@...ux.com>
Subject: linux-next: manual merge of the akpm tree with the char-misc tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/w1/w1_int.c between commit fdc9167a7853 ("w1: use pr_* instead
of printk") from the char-misc tree and commit "drivers/w1/w1_int.c:
call put_device if device_register fails" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/w1/w1_int.c
index 47249a30eae3,ec3fc9335f0d..000000000000
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@@ -90,10 -91,9 +90,9 @@@ static struct w1_master *w1_alloc_dev(u
  
  	err = device_register(&dev->dev);
  	if (err) {
 -		printk(KERN_ERR "Failed to register master device. err=%d\n", err);
 +		pr_err("Failed to register master device. err=%d\n", err);
- 		memset(dev, 0, sizeof(struct w1_master));
- 		kfree(dev);
- 		dev = NULL;
+ 		put_device(&dev->dev);
+ 		return NULL;
  	}
  
  	return dev;

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)