diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:29:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:29:04 -0400 |
| commit | b5ed7639c9f502898af4109e778f5613dacbfd9c (patch) | |
| tree | abe908c60ce1ea8f201028c9fc830cacd25c724b /drivers/message/i2o/iop.c | |
| parent | [PATCH] net: au1000_eth: PHY framework conversion (diff) | |
| parent | [PATCH] sky2: stop/start hardware idle timer on suspend/resume (diff) | |
| download | linux-dev-b5ed7639c9f502898af4109e778f5613dacbfd9c.tar.xz linux-dev-b5ed7639c9f502898af4109e778f5613dacbfd9c.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/message/i2o/iop.c')
| -rw-r--r-- | drivers/message/i2o/iop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 492167446936..febbdd4e0605 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c @@ -804,8 +804,6 @@ void i2o_iop_remove(struct i2o_controller *c) /* Ask the IOP to switch to RESET state */ i2o_iop_reset(c); - - put_device(&c->device); } /** @@ -1059,7 +1057,7 @@ struct i2o_controller *i2o_iop_alloc(void) snprintf(poolname, sizeof(poolname), "i2o_%s_msg_inpool", c->name); if (i2o_pool_alloc - (&c->in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4, + (&c->in_msg, poolname, I2O_INBOUND_MSG_FRAME_SIZE * 4 + sizeof(u32), I2O_MSG_INPOOL_MIN)) { kfree(c); return ERR_PTR(-ENOMEM); |