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)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 Apr 2014 15:23:19 +0000 (16:23 +0100)
commit25f60b0397e698cce0473c7c9ff321b7765434d3
tree8bb9682ae4a72c17514a4e2878a9f4547e647836
parentfd87fcdbd0d83ad29951002e8e320f9688a2dbd0
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/w1/w1_netlink.c