diff options
Diffstat (limited to 'drivers/message/i2o/pci.c')
-rw-r--r-- | drivers/message/i2o/pci.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 685a89547a51..610ef1204e68 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -186,31 +186,29 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c) | |||
186 | } | 186 | } |
187 | } | 187 | } |
188 | 188 | ||
189 | if (i2o_dma_alloc(dev, &c->status, 8, GFP_KERNEL)) { | 189 | if (i2o_dma_alloc(dev, &c->status, 8)) { |
190 | i2o_pci_free(c); | 190 | i2o_pci_free(c); |
191 | return -ENOMEM; | 191 | return -ENOMEM; |
192 | } | 192 | } |
193 | 193 | ||
194 | if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt), GFP_KERNEL)) { | 194 | if (i2o_dma_alloc(dev, &c->hrt, sizeof(i2o_hrt))) { |
195 | i2o_pci_free(c); | 195 | i2o_pci_free(c); |
196 | return -ENOMEM; | 196 | return -ENOMEM; |
197 | } | 197 | } |
198 | 198 | ||
199 | if (i2o_dma_alloc(dev, &c->dlct, 8192, GFP_KERNEL)) { | 199 | if (i2o_dma_alloc(dev, &c->dlct, 8192)) { |
200 | i2o_pci_free(c); | 200 | i2o_pci_free(c); |
201 | return -ENOMEM; | 201 | return -ENOMEM; |
202 | } | 202 | } |
203 | 203 | ||
204 | if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block), | 204 | if (i2o_dma_alloc(dev, &c->status_block, sizeof(i2o_status_block))) { |
205 | GFP_KERNEL)) { | ||
206 | i2o_pci_free(c); | 205 | i2o_pci_free(c); |
207 | return -ENOMEM; | 206 | return -ENOMEM; |
208 | } | 207 | } |
209 | 208 | ||
210 | if (i2o_dma_alloc | 209 | if (i2o_dma_alloc(dev, &c->out_queue, |
211 | (dev, &c->out_queue, | 210 | I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE * |
212 | I2O_MAX_OUTBOUND_MSG_FRAMES * I2O_OUTBOUND_MSG_FRAME_SIZE * | 211 | sizeof(u32))) { |
213 | sizeof(u32), GFP_KERNEL)) { | ||
214 | i2o_pci_free(c); | 212 | i2o_pci_free(c); |
215 | return -ENOMEM; | 213 | return -ENOMEM; |
216 | } | 214 | } |