aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-omap/mailbox.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 48e161c642a5..d9aa87c0a921 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -281,11 +281,11 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
281 281
282 return 0; 282 return 0;
283 283
284 fail_alloc_rxq: 284fail_alloc_rxq:
285 mbox_queue_free(mbox->txq); 285 mbox_queue_free(mbox->txq);
286 fail_alloc_txq: 286fail_alloc_txq:
287 free_irq(mbox->irq, mbox); 287 free_irq(mbox->irq, mbox);
288 fail_request_irq: 288fail_request_irq:
289 if (mbox->ops->shutdown) 289 if (mbox->ops->shutdown)
290 mbox->ops->shutdown(mbox); 290 mbox->ops->shutdown(mbox);
291 291
@@ -396,7 +396,8 @@ static int __init omap_mbox_init(void)
396 396
397 /* kfifo size sanity check: alignment and minimal size */ 397 /* kfifo size sanity check: alignment and minimal size */
398 mbox_kfifo_size = ALIGN(mbox_kfifo_size, sizeof(mbox_msg_t)); 398 mbox_kfifo_size = ALIGN(mbox_kfifo_size, sizeof(mbox_msg_t));
399 mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size, sizeof(mbox_msg_t)); 399 mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size,
400 sizeof(mbox_msg_t));
400 401
401 return 0; 402 return 0;
402} 403}