]> git.baikalelectronics.ru Git - kernel.git/commit
caif-hsi: Fix merge issues.
authorSjur Brændeland <sjur.brandeland@stericsson.com>
Thu, 28 Jun 2012 20:36:20 +0000 (20:36 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Jun 2012 07:46:53 +0000 (00:46 -0700)
commitc89f74e98556dfb35991e2977ea837b59484318a
tree0a3fceb23fd842e13a81f21b436bc68995467356
parentd5cd7eeca089e0779aa0fba147c826b28c30ea99
caif-hsi: Fix merge issues.

Fix the failing merge in net-next by reverting the last
net-next merge for caif_hsi.c and then merge in the commit:
"caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost"
from the net repository.

The commit:"caif-hsi: Add missing return in error path" from
net repository was dropped, as it changed code previously removed in the
net-next repository.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/caif/caif_hsi.c