From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fjodor Schelichow <fjodor.schelichow@hotmail.com>,
Levente Kurusa <levex@linux.com>
Subject: linux-next: manual merge of the akpm tree with the char-misc tree
Date: Mon, 23 Jun 2014 14:33:04 +1000 [thread overview]
Message-ID: <20140623143304.79917bfa@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
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@canb.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;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-06-23 4:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 4:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-20 4:20 linux-next: manual merge of the akpm tree with the char-misc tree Stephen Rothwell
2013-03-20 13:08 ` KY Srinivasan
2013-03-20 14:29 ` Haiyang Zhang
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=20140623143304.79917bfa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=fjodor.schelichow@hotmail.com \
--cc=greg@kroah.com \
--cc=levex@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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).