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

Commit 650f81d4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into work-next 

Russell writes:

Greg,

Please incorporate a fix for the component helper.
This fixes a bug reported by Sachin Kamat found with Exynos DRM.
parents 64c720ad b509cc80

drivers/base/component.c

+6 −4
Original line number Diff line number Diff line
@@ -293,10 +293,12 @@ int component_master_add_with_match(struct device *dev, 
	if (ops->add_components && match)

		return -EINVAL;



	if (match) {

		/* Reallocate the match array for its true size */

		match = component_match_realloc(dev, match, match->num);

		if (IS_ERR(match))

			return PTR_ERR(match);

	}



	master = kzalloc(sizeof(*master), GFP_KERNEL);

	if (!master)