summary refs log tree commit diff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-30 10:37:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-30 10:37:18 -0700
commitc4011283a7d5d64a50991dd3baa9acdf3d49092c (patch)
treee04fbd50807630d38bc13ddf5357eb96f90b551f
parent1127b219ce9481c84edad9711626d856127d5e51 (diff)
parent892fc9f6835ecf075efac20789b012c5c9997fcc (diff)
downloadlinux-c4011283a7d5d64a50991dd3baa9acdf3d49092c.tar.gz
Merge tag 'dma-mapping-5.9-2' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig:
 "Fix a possibly uninitialized variable (Dan Carpenter)"

* tag 'dma-mapping-5.9-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()
-rw-r--r--kernel/dma/pool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 06582b488e31..1281c0f0442b 100644
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -84,7 +84,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
 			      gfp_t gfp)
 {
 	unsigned int order;
-	struct page *page;
+	struct page *page = NULL;
 	void *addr;
 	int ret = -ENOMEM;