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

Commit 620bb636 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/driver-core' into sh/clkfwk

parents c7ed1ab3 bd05086b

drivers/base/platform.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -1245,19 +1245,20 @@ static int __init early_platform_driver_probe_id(char *class_str, 
			 * rest of the driver core is initialized.

			 * rest of the driver core is initialized.

			 */

			 */

			if (!match->dev.init_name) {

			if (!match->dev.init_name) {

				char buf[32];



				if (match->id != -1)

				if (match->id != -1)

					snprintf(buf, sizeof(buf), "%s.%d",

					match->dev.init_name =

						 match->name, match->id);

						kasprintf(GFP_KERNEL, "%s.%d",

							  match->name,

							  match->id);

				else

				else

					snprintf(buf, sizeof(buf), "%s",

					match->dev.init_name =

						kasprintf(GFP_KERNEL, "%s",

							  match->name);

							  match->name);





				match->dev.init_name = kstrdup(buf, GFP_KERNEL);

				if (!match->dev.init_name)

				if (!match->dev.init_name)

					return -ENOMEM;

					return -ENOMEM;

			}

			}



			if (epdrv->pdrv->probe(match))

			if (epdrv->pdrv->probe(match))

				pr_warning("%s: unable to probe %s early.\n",

				pr_warning("%s: unable to probe %s early.\n",

					   class_str, match->name);

					   class_str, match->name);