diff options
Diffstat (limited to 'lib/scatterlist.c')
| -rw-r--r-- | lib/scatterlist.c | 6 | 
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 004fc70fc56a..c6cf82242d65 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -651,7 +651,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,  {  	unsigned int offset = 0;  	struct sg_mapping_iter miter; -	unsigned long flags;  	unsigned int sg_flags = SG_MITER_ATOMIC;  	if (to_buffer) @@ -664,9 +663,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,  	if (!sg_miter_skip(&miter, skip))  		return false; -	local_irq_save(flags); - -	while (sg_miter_next(&miter) && offset < buflen) { +	while ((offset < buflen) && sg_miter_next(&miter)) {  		unsigned int len;  		len = min(miter.length, buflen - offset); @@ -681,7 +678,6 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,  	sg_miter_stop(&miter); -	local_irq_restore(flags);  	return offset;  }  EXPORT_SYMBOL(sg_copy_buffer);  | 
