You are right.
Apparently something's wrong with my git,
$ git show 7bf1e44f865523aa16e0eb340a82d643da9215b5 commit 7bf1e44f865523aa16e0eb340a82d643da9215b5 Merge: e5770b7bdbfe 32c1431eea48 Author: Greg Kroah-Hartman <email address hidden> Date: Mon Jun 12 08:20:47 2017 +0200
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <email address hidden>
diff --cc drivers/staging/ccree/ssi_buffer_mgr.c index 1ff603f8f8f5,6471d3d2d375..88ebda854377 --- a/drivers/staging/ccree/ssi_buffer_mgr.c +++ b/drivers/staging/ccree/ssi_buffer_mgr.c @@@ -136,13 -210,14 +136,14 @@@ void ssi_buffer_mgr_zero_sgl(struct sca */ void ssi_buffer_mgr_copy_scatterlist_portion( u8 *dest, struct scatterlist *sg, - uint32_t to_skip, uint32_t end, + u32 to_skip, u32 end, enum ssi_sg_cpy_direct direct) { - uint32_t nents, lbytes; + u32 nents, lbytes;
nents = ssi_buffer_mgr_get_sgl_nents(sg, end, &lbytes, NULL); - sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip), 0, (direct == SSI_SG_TO_BUF)); + sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip, + (direct == SSI_SG_TO_BUF)); }
static inline int ssi_buffer_mgr_render_buff_to_mlli(
You are right.
Apparently something's wrong with my git,
$ git show 7bf1e44f865523a a16e0eb340a82d6 43da9215b5 a16e0eb340a82d6 43da9215b5
commit 7bf1e44f865523a
Merge: e5770b7bdbfe 32c1431eea48
Author: Greg Kroah-Hartman <email address hidden>
Date: Mon Jun 12 08:20:47 2017 +0200
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <email address hidden>
diff --cc drivers/ staging/ ccree/ssi_ buffer_ mgr.c 6471d3d2d375. .88ebda854377 staging/ ccree/ssi_ buffer_ mgr.c staging/ ccree/ssi_ buffer_ mgr.c mgr_zero_ sgl(struct sca mgr_copy_ scatterlist_ portion(
index 1ff603f8f8f5,
--- a/drivers/
+++ b/drivers/
@@@ -136,13 -210,14 +136,14 @@@ void ssi_buffer_
*/
void ssi_buffer_
u8 *dest, struct scatterlist *sg,
- uint32_t to_skip, uint32_t end,
+ u32 to_skip, u32 end,
enum ssi_sg_cpy_direct direct)
{
- uint32_t nents, lbytes;
+ u32 nents, lbytes;
nents = ssi_buffer_ mgr_get_ sgl_nents( sg, end, &lbytes, NULL);
- sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip), 0, (direct == SSI_SG_TO_BUF));
+ sg_copy_buffer(sg, nents, (void *)dest, (end - to_skip + 1), to_skip,
+ (direct == SSI_SG_TO_BUF));
}
static inline int ssi_buffer_ mgr_render_ buff_to_ mlli(