diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
| commit | c0515566f3117c44b0572559bcc3cb00899b0910 (patch) | |
| tree | 3c7e36ed6e78812b9276a81d6b3a2e80788003c5 /drivers/usb/serial/console.c | |
| parent | 4385cecf1f5866fb33fc95e2ee26a44e9b6f6be2 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into x86/cleanups
Diffstat (limited to 'drivers/usb/serial/console.c')
| -rw-r--r-- | drivers/usb/serial/console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index 5b20de130e08..5b95009d2fbb 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
| @@ -135,6 +135,7 @@ static int usb_console_setup(struct console *co, char *options) | |||
| 135 | err("no more memory"); | 135 | err("no more memory"); |
| 136 | goto reset_open_count; | 136 | goto reset_open_count; |
| 137 | } | 137 | } |
| 138 | kref_init(&tty->kref); | ||
| 138 | termios = kzalloc(sizeof(*termios), GFP_KERNEL); | 139 | termios = kzalloc(sizeof(*termios), GFP_KERNEL); |
| 139 | if (!termios) { | 140 | if (!termios) { |
| 140 | retval = -ENOMEM; | 141 | retval = -ENOMEM; |