w1: fix w1_send_slave dropping a slave id
authorDavid Fries <David@Fries.net>
Thu, 16 Jan 2014 04:29:12 +0000 (22:29 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 May 2014 14:55:28 +0000 (07:55 -0700)
commit1a8be0fe6d1f30cbad40c9ca1a5ef7c080f625a7
tree8a3e36073e88b92ac8ed1ff550db6f9a82c6057a
parent81a6cff47303642deafb3f1ac2a7ac33e04bbae2
w1: fix w1_send_slave dropping a slave id

commit 6b355b33a64fd6d8ead2b838ec16fb9b551f71e8 upstream.

Previous logic,
if (avail > 8) {
store slave;
return;
}
send data; clear;

The logic error is, if there isn't space send the buffer and clear,
but the slave wasn't added to the now empty buffer loosing that slave
id.  It also should have been "if (avail >= 8)" because when it is 8,
there is space.

Instead, if there isn't space send and clear the buffer, then there is
always space for the slave id.

Signed-off-by: David Fries <David@Fries.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/w1/w1_netlink.c