diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/s390/net/fsm.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/s390/net/fsm.c')
| -rw-r--r-- | drivers/s390/net/fsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index 2c1db8036b7c..e5dea67f902e 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #include "fsm.h" | 6 | #include "fsm.h" |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | #include <linux/timer.h> | 9 | #include <linux/timer.h> |
| 9 | 10 | ||
| 10 | MODULE_AUTHOR("(C) 2000 IBM Corp. by Fritz Elfert (felfert@millenux.com)"); | 11 | MODULE_AUTHOR("(C) 2000 IBM Corp. by Fritz Elfert (felfert@millenux.com)"); |
| @@ -27,6 +28,7 @@ init_fsm(char *name, const char **state_names, const char **event_names, int nr_ | |||
| 27 | return NULL; | 28 | return NULL; |
| 28 | } | 29 | } |
| 29 | strlcpy(this->name, name, sizeof(this->name)); | 30 | strlcpy(this->name, name, sizeof(this->name)); |
| 31 | init_waitqueue_head(&this->wait_q); | ||
| 30 | 32 | ||
| 31 | f = kzalloc(sizeof(fsm), order); | 33 | f = kzalloc(sizeof(fsm), order); |
| 32 | if (f == NULL) { | 34 | if (f == NULL) { |