|
@@ -1351,24 +1351,18 @@ int i2400m_rx_setup(struct i2400m *i2400m)
|
|
|
i2400m->rx_reorder = i2400m_rx_reorder_disabled? 0 : 1;
|
|
|
if (i2400m->rx_reorder) {
|
|
|
unsigned itr;
|
|
|
- size_t size;
|
|
|
struct i2400m_roq_log *rd;
|
|
|
|
|
|
result = -ENOMEM;
|
|
|
|
|
|
- size = sizeof(i2400m->rx_roq[0]) * (I2400M_RO_CIN + 1);
|
|
|
- i2400m->rx_roq = kzalloc(size, GFP_KERNEL);
|
|
|
- if (i2400m->rx_roq == NULL) {
|
|
|
- dev_err(dev, "RX: cannot allocate %zu bytes for "
|
|
|
- "reorder queues\n", size);
|
|
|
+ i2400m->rx_roq = kcalloc(I2400M_RO_CIN + 1,
|
|
|
+ sizeof(i2400m->rx_roq[0]), GFP_KERNEL);
|
|
|
+ if (i2400m->rx_roq == NULL)
|
|
|
goto error_roq_alloc;
|
|
|
- }
|
|
|
|
|
|
- size = sizeof(*i2400m->rx_roq[0].log) * (I2400M_RO_CIN + 1);
|
|
|
- rd = kzalloc(size, GFP_KERNEL);
|
|
|
+ rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
|
|
|
+ GFP_KERNEL);
|
|
|
if (rd == NULL) {
|
|
|
- dev_err(dev, "RX: cannot allocate %zu bytes for "
|
|
|
- "reorder queues log areas\n", size);
|
|
|
result = -ENOMEM;
|
|
|
goto error_roq_log_alloc;
|
|
|
}
|