Input: pxa27x_keypad - allow modifying keymap from userspace
Tested-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Родитель
7cac9cd935
Коммит
bd96f37895
|
@ -6,6 +6,8 @@
|
||||||
|
|
||||||
#define MAX_MATRIX_KEY_ROWS (8)
|
#define MAX_MATRIX_KEY_ROWS (8)
|
||||||
#define MAX_MATRIX_KEY_COLS (8)
|
#define MAX_MATRIX_KEY_COLS (8)
|
||||||
|
#define MATRIX_ROW_SHIFT (3)
|
||||||
|
#define MAX_DIRECT_KEY_NUM (8)
|
||||||
|
|
||||||
/* pxa3xx keypad platform specific parameters
|
/* pxa3xx keypad platform specific parameters
|
||||||
*
|
*
|
||||||
|
@ -34,7 +36,7 @@ struct pxa27x_keypad_platform_data {
|
||||||
|
|
||||||
/* direct keys */
|
/* direct keys */
|
||||||
int direct_key_num;
|
int direct_key_num;
|
||||||
unsigned int direct_key_map[8];
|
unsigned int direct_key_map[MAX_DIRECT_KEY_NUM];
|
||||||
|
|
||||||
/* rotary encoders 0 */
|
/* rotary encoders 0 */
|
||||||
int enable_rotary0;
|
int enable_rotary0;
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/pxa27x_keypad.h>
|
#include <mach/pxa27x_keypad.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Keypad Controller registers
|
* Keypad Controller registers
|
||||||
*/
|
*/
|
||||||
|
@ -96,7 +95,8 @@
|
||||||
#define keypad_readl(off) __raw_readl(keypad->mmio_base + (off))
|
#define keypad_readl(off) __raw_readl(keypad->mmio_base + (off))
|
||||||
#define keypad_writel(off, v) __raw_writel((v), keypad->mmio_base + (off))
|
#define keypad_writel(off, v) __raw_writel((v), keypad->mmio_base + (off))
|
||||||
|
|
||||||
#define MAX_MATRIX_KEY_NUM (8 * 8)
|
#define MAX_MATRIX_KEY_NUM (MAX_MATRIX_KEY_ROWS * MAX_MATRIX_KEY_COLS)
|
||||||
|
#define MAX_KEYPAD_KEYS (MAX_MATRIX_KEY_NUM + MAX_DIRECT_KEY_NUM)
|
||||||
|
|
||||||
struct pxa27x_keypad {
|
struct pxa27x_keypad {
|
||||||
struct pxa27x_keypad_platform_data *pdata;
|
struct pxa27x_keypad_platform_data *pdata;
|
||||||
|
@ -107,73 +107,82 @@ struct pxa27x_keypad {
|
||||||
|
|
||||||
int irq;
|
int irq;
|
||||||
|
|
||||||
/* matrix key code map */
|
unsigned short keycodes[MAX_KEYPAD_KEYS];
|
||||||
unsigned short matrix_keycodes[MAX_MATRIX_KEY_NUM];
|
int rotary_rel_code[2];
|
||||||
|
|
||||||
/* state row bits of each column scan */
|
/* state row bits of each column scan */
|
||||||
uint32_t matrix_key_state[MAX_MATRIX_KEY_COLS];
|
uint32_t matrix_key_state[MAX_MATRIX_KEY_COLS];
|
||||||
uint32_t direct_key_state;
|
uint32_t direct_key_state;
|
||||||
|
|
||||||
unsigned int direct_key_mask;
|
unsigned int direct_key_mask;
|
||||||
|
|
||||||
int rotary_rel_code[2];
|
|
||||||
int rotary_up_key[2];
|
|
||||||
int rotary_down_key[2];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
|
static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
|
||||||
{
|
{
|
||||||
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
||||||
struct input_dev *input_dev = keypad->input_dev;
|
struct input_dev *input_dev = keypad->input_dev;
|
||||||
|
unsigned short keycode;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < pdata->matrix_key_map_size; i++) {
|
for (i = 0; i < pdata->matrix_key_map_size; i++) {
|
||||||
unsigned int key = pdata->matrix_key_map[i];
|
unsigned int key = pdata->matrix_key_map[i];
|
||||||
unsigned int row = KEY_ROW(key);
|
unsigned int row = KEY_ROW(key);
|
||||||
unsigned int col = KEY_COL(key);
|
unsigned int col = KEY_COL(key);
|
||||||
unsigned short code = KEY_VAL(key);
|
unsigned int scancode = MATRIX_SCAN_CODE(row, col,
|
||||||
|
MATRIX_ROW_SHIFT);
|
||||||
|
|
||||||
keypad->matrix_keycodes[(row << 3) + col] = code;
|
keycode = KEY_VAL(key);
|
||||||
__set_bit(code, input_dev->keybit);
|
keypad->keycodes[scancode] = keycode;
|
||||||
|
__set_bit(keycode, input_dev->keybit);
|
||||||
}
|
}
|
||||||
__clear_bit(KEY_RESERVED, input_dev->keybit);
|
|
||||||
|
|
||||||
for (i = 0; i < pdata->direct_key_num; i++)
|
for (i = 0; i < pdata->direct_key_num; i++) {
|
||||||
__set_bit(pdata->direct_key_map[i], input_dev->keybit);
|
keycode = pdata->direct_key_map[i];
|
||||||
|
keypad->keycodes[MAX_MATRIX_KEY_NUM + i] = keycode;
|
||||||
keypad->rotary_up_key[0] = pdata->rotary0_up_key;
|
__set_bit(keycode, input_dev->keybit);
|
||||||
keypad->rotary_up_key[1] = pdata->rotary1_up_key;
|
}
|
||||||
keypad->rotary_down_key[0] = pdata->rotary0_down_key;
|
|
||||||
keypad->rotary_down_key[1] = pdata->rotary1_down_key;
|
|
||||||
keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
|
|
||||||
keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
|
|
||||||
|
|
||||||
if (pdata->enable_rotary0) {
|
if (pdata->enable_rotary0) {
|
||||||
if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
|
if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
|
||||||
__set_bit(pdata->rotary0_up_key, input_dev->keybit);
|
keycode = pdata->rotary0_up_key;
|
||||||
__set_bit(pdata->rotary0_down_key, input_dev->keybit);
|
keypad->keycodes[MAX_MATRIX_KEY_NUM + 0] = keycode;
|
||||||
} else
|
__set_bit(keycode, input_dev->keybit);
|
||||||
|
|
||||||
|
keycode = pdata->rotary0_down_key;
|
||||||
|
keypad->keycodes[MAX_MATRIX_KEY_NUM + 1] = keycode;
|
||||||
|
__set_bit(keycode, input_dev->keybit);
|
||||||
|
|
||||||
|
keypad->rotary_rel_code[0] = -1;
|
||||||
|
} else {
|
||||||
|
keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
|
||||||
__set_bit(pdata->rotary0_rel_code, input_dev->relbit);
|
__set_bit(pdata->rotary0_rel_code, input_dev->relbit);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pdata->enable_rotary1) {
|
if (pdata->enable_rotary1) {
|
||||||
if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
|
if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
|
||||||
__set_bit(pdata->rotary1_up_key, input_dev->keybit);
|
keycode = pdata->rotary1_up_key;
|
||||||
__set_bit(pdata->rotary1_down_key, input_dev->keybit);
|
keypad->keycodes[MAX_MATRIX_KEY_NUM + 2] = keycode;
|
||||||
} else
|
__set_bit(keycode, input_dev->keybit);
|
||||||
__set_bit(pdata->rotary1_rel_code, input_dev->relbit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned int lookup_matrix_keycode(
|
keycode = pdata->rotary1_down_key;
|
||||||
struct pxa27x_keypad *keypad, int row, int col)
|
keypad->keycodes[MAX_MATRIX_KEY_NUM + 3] = keycode;
|
||||||
{
|
__set_bit(keycode, input_dev->keybit);
|
||||||
return keypad->matrix_keycodes[(row << 3) + col];
|
|
||||||
|
keypad->rotary_rel_code[1] = -1;
|
||||||
|
} else {
|
||||||
|
keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
|
||||||
|
__set_bit(pdata->rotary1_rel_code, input_dev->relbit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
__clear_bit(KEY_RESERVED, input_dev->keybit);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
|
static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
|
||||||
{
|
{
|
||||||
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
||||||
|
struct input_dev *input_dev = keypad->input_dev;
|
||||||
int row, col, num_keys_pressed = 0;
|
int row, col, num_keys_pressed = 0;
|
||||||
uint32_t new_state[MAX_MATRIX_KEY_COLS];
|
uint32_t new_state[MAX_MATRIX_KEY_COLS];
|
||||||
uint32_t kpas = keypad_readl(KPAS);
|
uint32_t kpas = keypad_readl(KPAS);
|
||||||
|
@ -216,6 +225,7 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
|
||||||
scan:
|
scan:
|
||||||
for (col = 0; col < pdata->matrix_key_cols; col++) {
|
for (col = 0; col < pdata->matrix_key_cols; col++) {
|
||||||
uint32_t bits_changed;
|
uint32_t bits_changed;
|
||||||
|
int code;
|
||||||
|
|
||||||
bits_changed = keypad->matrix_key_state[col] ^ new_state[col];
|
bits_changed = keypad->matrix_key_state[col] ^ new_state[col];
|
||||||
if (bits_changed == 0)
|
if (bits_changed == 0)
|
||||||
|
@ -225,12 +235,13 @@ scan:
|
||||||
if ((bits_changed & (1 << row)) == 0)
|
if ((bits_changed & (1 << row)) == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
input_report_key(keypad->input_dev,
|
code = MATRIX_SCAN_CODE(row, col, MATRIX_ROW_SHIFT);
|
||||||
lookup_matrix_keycode(keypad, row, col),
|
input_event(input_dev, EV_MSC, MSC_SCAN, code);
|
||||||
new_state[col] & (1 << row));
|
input_report_key(input_dev, keypad->keycodes[code],
|
||||||
|
new_state[col] & (1 << row));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
input_sync(keypad->input_dev);
|
input_sync(input_dev);
|
||||||
memcpy(keypad->matrix_key_state, new_state, sizeof(new_state));
|
memcpy(keypad->matrix_key_state, new_state, sizeof(new_state));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -253,13 +264,15 @@ static void report_rotary_event(struct pxa27x_keypad *keypad, int r, int delta)
|
||||||
if (delta == 0)
|
if (delta == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (keypad->rotary_up_key[r] && keypad->rotary_down_key[r]) {
|
if (keypad->rotary_rel_code[r] == -1) {
|
||||||
int keycode = (delta > 0) ? keypad->rotary_up_key[r] :
|
int code = MAX_MATRIX_KEY_NUM + 2 * r + (delta > 0 ? 0 : 1);
|
||||||
keypad->rotary_down_key[r];
|
unsigned char keycode = keypad->keycodes[code];
|
||||||
|
|
||||||
/* simulate a press-n-release */
|
/* simulate a press-n-release */
|
||||||
|
input_event(dev, EV_MSC, MSC_SCAN, code);
|
||||||
input_report_key(dev, keycode, 1);
|
input_report_key(dev, keycode, 1);
|
||||||
input_sync(dev);
|
input_sync(dev);
|
||||||
|
input_event(dev, EV_MSC, MSC_SCAN, code);
|
||||||
input_report_key(dev, keycode, 0);
|
input_report_key(dev, keycode, 0);
|
||||||
input_sync(dev);
|
input_sync(dev);
|
||||||
} else {
|
} else {
|
||||||
|
@ -287,6 +300,7 @@ static void pxa27x_keypad_scan_rotary(struct pxa27x_keypad *keypad)
|
||||||
static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
|
static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
|
||||||
{
|
{
|
||||||
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
|
||||||
|
struct input_dev *input_dev = keypad->input_dev;
|
||||||
unsigned int new_state;
|
unsigned int new_state;
|
||||||
uint32_t kpdk, bits_changed;
|
uint32_t kpdk, bits_changed;
|
||||||
int i;
|
int i;
|
||||||
|
@ -296,9 +310,6 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
|
||||||
if (pdata->enable_rotary0 || pdata->enable_rotary1)
|
if (pdata->enable_rotary0 || pdata->enable_rotary1)
|
||||||
pxa27x_keypad_scan_rotary(keypad);
|
pxa27x_keypad_scan_rotary(keypad);
|
||||||
|
|
||||||
if (pdata->direct_key_map == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
|
new_state = KPDK_DK(kpdk) & keypad->direct_key_mask;
|
||||||
bits_changed = keypad->direct_key_state ^ new_state;
|
bits_changed = keypad->direct_key_state ^ new_state;
|
||||||
|
|
||||||
|
@ -306,12 +317,15 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (i = 0; i < pdata->direct_key_num; i++) {
|
for (i = 0; i < pdata->direct_key_num; i++) {
|
||||||
if (bits_changed & (1 << i))
|
if (bits_changed & (1 << i)) {
|
||||||
input_report_key(keypad->input_dev,
|
int code = MAX_MATRIX_KEY_NUM + i;
|
||||||
pdata->direct_key_map[i],
|
|
||||||
(new_state & (1 << i)));
|
input_event(input_dev, EV_MSC, MSC_SCAN, code);
|
||||||
|
input_report_key(input_dev, keypad->keycodes[code],
|
||||||
|
new_state & (1 << i));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
input_sync(keypad->input_dev);
|
input_sync(input_dev);
|
||||||
keypad->direct_key_state = new_state;
|
keypad->direct_key_state = new_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -432,38 +446,41 @@ static const struct dev_pm_ops pxa27x_keypad_pm_ops = {
|
||||||
|
|
||||||
static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
|
static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
|
struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data;
|
||||||
struct pxa27x_keypad *keypad;
|
struct pxa27x_keypad *keypad;
|
||||||
struct input_dev *input_dev;
|
struct input_dev *input_dev;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
int irq, error;
|
int irq, error;
|
||||||
|
|
||||||
keypad = kzalloc(sizeof(struct pxa27x_keypad), GFP_KERNEL);
|
if (pdata == NULL) {
|
||||||
if (keypad == NULL) {
|
|
||||||
dev_err(&pdev->dev, "failed to allocate driver data\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
keypad->pdata = pdev->dev.platform_data;
|
|
||||||
if (keypad->pdata == NULL) {
|
|
||||||
dev_err(&pdev->dev, "no platform data defined\n");
|
dev_err(&pdev->dev, "no platform data defined\n");
|
||||||
error = -EINVAL;
|
return -EINVAL;
|
||||||
goto failed_free;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
irq = platform_get_irq(pdev, 0);
|
irq = platform_get_irq(pdev, 0);
|
||||||
if (irq < 0) {
|
if (irq < 0) {
|
||||||
dev_err(&pdev->dev, "failed to get keypad irq\n");
|
dev_err(&pdev->dev, "failed to get keypad irq\n");
|
||||||
error = -ENXIO;
|
return -ENXIO;
|
||||||
goto failed_free;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (res == NULL) {
|
if (res == NULL) {
|
||||||
dev_err(&pdev->dev, "failed to get I/O memory\n");
|
dev_err(&pdev->dev, "failed to get I/O memory\n");
|
||||||
error = -ENXIO;
|
return -ENXIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
keypad = kzalloc(sizeof(struct pxa27x_keypad), GFP_KERNEL);
|
||||||
|
input_dev = input_allocate_device();
|
||||||
|
if (!keypad || !input_dev) {
|
||||||
|
dev_err(&pdev->dev, "failed to allocate memory\n");
|
||||||
|
error = -ENOMEM;
|
||||||
goto failed_free;
|
goto failed_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keypad->pdata = pdata;
|
||||||
|
keypad->input_dev = input_dev;
|
||||||
|
keypad->irq = irq;
|
||||||
|
|
||||||
res = request_mem_region(res->start, resource_size(res), pdev->name);
|
res = request_mem_region(res->start, resource_size(res), pdev->name);
|
||||||
if (res == NULL) {
|
if (res == NULL) {
|
||||||
dev_err(&pdev->dev, "failed to request I/O memory\n");
|
dev_err(&pdev->dev, "failed to request I/O memory\n");
|
||||||
|
@ -485,43 +502,35 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
|
||||||
goto failed_free_io;
|
goto failed_free_io;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create and register the input driver. */
|
|
||||||
input_dev = input_allocate_device();
|
|
||||||
if (!input_dev) {
|
|
||||||
dev_err(&pdev->dev, "failed to allocate input device\n");
|
|
||||||
error = -ENOMEM;
|
|
||||||
goto failed_put_clk;
|
|
||||||
}
|
|
||||||
|
|
||||||
input_dev->name = pdev->name;
|
input_dev->name = pdev->name;
|
||||||
input_dev->id.bustype = BUS_HOST;
|
input_dev->id.bustype = BUS_HOST;
|
||||||
input_dev->open = pxa27x_keypad_open;
|
input_dev->open = pxa27x_keypad_open;
|
||||||
input_dev->close = pxa27x_keypad_close;
|
input_dev->close = pxa27x_keypad_close;
|
||||||
input_dev->dev.parent = &pdev->dev;
|
input_dev->dev.parent = &pdev->dev;
|
||||||
|
|
||||||
keypad->input_dev = input_dev;
|
input_dev->keycode = keypad->keycodes;
|
||||||
|
input_dev->keycodesize = sizeof(keypad->keycodes[0]);
|
||||||
|
input_dev->keycodemax = ARRAY_SIZE(keypad->keycodes);
|
||||||
|
|
||||||
input_set_drvdata(input_dev, keypad);
|
input_set_drvdata(input_dev, keypad);
|
||||||
|
|
||||||
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
|
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
|
||||||
if ((keypad->pdata->enable_rotary0 &&
|
input_set_capability(input_dev, EV_MSC, MSC_SCAN);
|
||||||
keypad->pdata->rotary0_rel_code) ||
|
|
||||||
(keypad->pdata->enable_rotary1 &&
|
|
||||||
keypad->pdata->rotary1_rel_code)) {
|
|
||||||
input_dev->evbit[0] |= BIT_MASK(EV_REL);
|
|
||||||
}
|
|
||||||
|
|
||||||
pxa27x_keypad_build_keycode(keypad);
|
pxa27x_keypad_build_keycode(keypad);
|
||||||
platform_set_drvdata(pdev, keypad);
|
|
||||||
|
if ((pdata->enable_rotary0 && keypad->rotary_rel_code[0] != -1) ||
|
||||||
|
(pdata->enable_rotary1 && keypad->rotary_rel_code[1] != -1)) {
|
||||||
|
input_dev->evbit[0] |= BIT_MASK(EV_REL);
|
||||||
|
}
|
||||||
|
|
||||||
error = request_irq(irq, pxa27x_keypad_irq_handler, IRQF_DISABLED,
|
error = request_irq(irq, pxa27x_keypad_irq_handler, IRQF_DISABLED,
|
||||||
pdev->name, keypad);
|
pdev->name, keypad);
|
||||||
if (error) {
|
if (error) {
|
||||||
dev_err(&pdev->dev, "failed to request IRQ\n");
|
dev_err(&pdev->dev, "failed to request IRQ\n");
|
||||||
goto failed_free_dev;
|
goto failed_put_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
keypad->irq = irq;
|
|
||||||
|
|
||||||
/* Register the input device */
|
/* Register the input device */
|
||||||
error = input_register_device(input_dev);
|
error = input_register_device(input_dev);
|
||||||
if (error) {
|
if (error) {
|
||||||
|
@ -529,15 +538,13 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
|
||||||
goto failed_free_irq;
|
goto failed_free_irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, keypad);
|
||||||
device_init_wakeup(&pdev->dev, 1);
|
device_init_wakeup(&pdev->dev, 1);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
failed_free_irq:
|
failed_free_irq:
|
||||||
free_irq(irq, pdev);
|
free_irq(irq, pdev);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
failed_free_dev:
|
|
||||||
input_free_device(input_dev);
|
|
||||||
failed_put_clk:
|
failed_put_clk:
|
||||||
clk_put(keypad->clk);
|
clk_put(keypad->clk);
|
||||||
failed_free_io:
|
failed_free_io:
|
||||||
|
@ -545,6 +552,7 @@ failed_free_io:
|
||||||
failed_free_mem:
|
failed_free_mem:
|
||||||
release_mem_region(res->start, resource_size(res));
|
release_mem_region(res->start, resource_size(res));
|
||||||
failed_free:
|
failed_free:
|
||||||
|
input_free_device(input_dev);
|
||||||
kfree(keypad);
|
kfree(keypad);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
@ -567,6 +575,7 @@ static int __devexit pxa27x_keypad_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
kfree(keypad);
|
kfree(keypad);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче