diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/s390/net/fsm.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/s390/net/fsm.c')
| -rw-r--r-- | drivers/s390/net/fsm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index 2c1db8036b7c..cae48cbc5e96 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c | |||
| @@ -27,6 +27,7 @@ init_fsm(char *name, const char **state_names, const char **event_names, int nr_ | |||
| 27 | return NULL; | 27 | return NULL; |
| 28 | } | 28 | } |
| 29 | strlcpy(this->name, name, sizeof(this->name)); | 29 | strlcpy(this->name, name, sizeof(this->name)); |
| 30 | init_waitqueue_head(&this->wait_q); | ||
| 30 | 31 | ||
| 31 | f = kzalloc(sizeof(fsm), order); | 32 | f = kzalloc(sizeof(fsm), order); |
| 32 | if (f == NULL) { | 33 | if (f == NULL) { |