Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec472ed authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'integrator-fixes-armsoc' of... 

Merge tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into fixes

Fixes for the Integrator:
- Handle failed allocations in the IM/PC bus attachment.
- Use struct_size() for allocation.

* tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: integrator: impd1: use struct_size() in devm_kzalloc()
  gpio: pl061: handle failed allocations

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 431a8b73 21face6f

arch/arm/mach-integrator/impd1.c

+6 −2
Original line number Diff line number Diff line
@@ -390,10 +390,14 @@ static int __ref impd1_probe(struct lm_device *dev) 
			char *mmciname;



			lookup = devm_kzalloc(&dev->dev,

					      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),

					      struct_size(lookup, table, 3),

					      GFP_KERNEL);

			chipname = devm_kstrdup(&dev->dev, devname, GFP_KERNEL);

			mmciname = kasprintf(GFP_KERNEL, "lm%x:00700", dev->id);

			mmciname = devm_kasprintf(&dev->dev, GFP_KERNEL,

						  "lm%x:00700", dev->id);

			if (!lookup || !chipname || !mmciname)

				return -ENOMEM;



			lookup->dev_id = mmciname;

			/*

			 * Offsets on GPIO block 1: