diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:03:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:03:17 -0400 |
| commit | ecf7f354e228ac9e80d2d25a0a0cbc8c876e9ab4 (patch) | |
| tree | 14c83181a6998c2e230c9746d131b48eaf4e978d /drivers/s390/net/ctcmain.c | |
| parent | c233289c29369dba7177ca873e9b8ed457af2a78 (diff) | |
| parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/s390/net/ctcmain.c')
| -rw-r--r-- | drivers/s390/net/ctcmain.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index 8a4b5812014..3257c22dd79 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c @@ -1714,6 +1714,9 @@ add_channel(struct ccw_device *cdev, enum channel_types type) kfree(ch); return 0; } + + spin_lock_init(&ch->collect_lock); + fsm_settimer(ch->fsm, &ch->timer); skb_queue_head_init(&ch->io_queue); skb_queue_head_init(&ch->collect_queue); |