xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-next' of git://github.com/rydberg/linux into next

Browse Source 
Pull in changes from Henrik: "a trivial MT documentation fix".
This commit is contained in:
Dmitry Torokhov
2013-06-27 23:00:25 -07:00
parent 8855f30cd2 257867dc8d
commit 31881d74b6
10393 changed files with 587414 additions and 322157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/keyboard/omap4-keypad.c
View File

@@ -215,18 +215,12 @@ static int omap4_keypad_parse_dt(struct device *dev,
struct omap4_keypad *keypad_data)
{
struct device_node *np = dev->of_node;
int err;
if (!np) {
dev_err(dev, "missing DT data");
return -EINVAL;
}
of_property_read_u32(np, "keypad,num-rows", &keypad_data->rows);
of_property_read_u32(np, "keypad,num-columns", &keypad_data->cols);
if (!keypad_data->rows || !keypad_data->cols) {
dev_err(dev, "number of keypad rows/columns not specified\n");
return -EINVAL;
}
err = matrix_keypad_parse_of_params(dev, &keypad_data->rows,
&keypad_data->cols);
if (err)
return err;
if (of_get_property(np, "linux,input-no-autorepeat", NULL))
keypad_data->no_autorepeat = true;