]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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:59:26 +0000 (07:59 -0700)
commitd98eafe3aef87dedc6fbbb2a4dbf37a797d02ff6
treeea389265c1784786762ac788d1ab4fd94aea76e1
parent53135e61923afaaa461bbca2b365767c39368ab2
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