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

Commit b3c87ce3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: gpio-keys: add definition for input device name"

parents 016f7269 7c98f8fd

drivers/input/keyboard/gpio_keys.c

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ static int gpio_keys_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	input_set_drvdata(input, ddata);



	input->name = pdata->name ? : pdev->name;

	input->name = GPIO_KEYS_DEV_NAME;

	input->phys = "gpio-keys/input0";

	input->dev.parent = &pdev->dev;

	input->open = gpio_keys_open;

include/linux/gpio_keys.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _GPIO_KEYS_H

#define _GPIO_KEYS_H



#define GPIO_KEYS_DEV_NAME "gpio-keys"



struct device;



/**