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

Commit c8391797 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 



Pull driver core fixes from Greg Kroah-Hartman:
 "Here are two tiny patches, one fixing a dynamic debug problem that the
  printk rework turned up, and the other one fixing an extcon problem
  that people reported.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
  drivers-core: make structured logging play nice with dynamic-debug
parents d7d45fed 7b7e995d

drivers/base/core.c

+7 −2
Original line number Diff line number Diff line
@@ -1865,6 +1865,7 @@ int __dev_printk(const char *level, const struct device *dev, 
		 struct va_format *vaf)

{

	char dict[128];

	const char *level_extra = "";

	size_t dictlen = 0;

	const char *subsys;
@@ -1911,10 +1912,14 @@ int __dev_printk(const char *level, const struct device *dev, 
				    "DEVICE=+%s:%s", subsys, dev_name(dev));

	}

skip:

	if (level[3])

		level_extra = &level[3]; /* skip past "<L>" */



	return printk_emit(0, level[1] - '0',

			   dictlen ? dict : NULL, dictlen,

			   "%s %s: %pV",

			   dev_driver_string(dev), dev_name(dev), vaf);

			   "%s %s: %s%pV",

			   dev_driver_string(dev), dev_name(dev),

			   level_extra, vaf);

}

EXPORT_SYMBOL(__dev_printk);

drivers/extcon/extcon_gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	ret = gpio_request_one(extcon_data->gpio, GPIOF_DIR_IN, pdev->name);

	ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,

				    pdev->name);

	if (ret < 0)

		goto err;