diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /drivers/input/power.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/power.c')
| -rw-r--r-- | drivers/input/power.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/power.c b/drivers/input/power.c index bfc5c63ebffe..526e6070600c 100644 --- a/drivers/input/power.c +++ b/drivers/input/power.c | |||
| @@ -103,9 +103,8 @@ static struct input_handle *power_connect(struct input_handler *handler, | |||
| 103 | { | 103 | { |
| 104 | struct input_handle *handle; | 104 | struct input_handle *handle; |
| 105 | 105 | ||
| 106 | if (!(handle = kmalloc(sizeof(struct input_handle), GFP_KERNEL))) | 106 | if (!(handle = kzalloc(sizeof(struct input_handle), GFP_KERNEL))) |
| 107 | return NULL; | 107 | return NULL; |
| 108 | memset(handle, 0, sizeof(struct input_handle)); | ||
| 109 | 108 | ||
| 110 | handle->dev = dev; | 109 | handle->dev = dev; |
| 111 | handle->handler = handler; | 110 | handle->handler = handler; |