Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226525
b: refs/heads/master
c: ab66ac3
h: refs/heads/master
i:
  226523: e6c896d
v: v3
  • Loading branch information
Kanigeri, Hari committed Dec 2, 2010
1 parent eda0338 commit 0a42190
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2295042b783c2b17d93cd5ab786bbfd4f2f5c90
refs/heads/master: ab66ac3007cb3e59fe80dfcf36aff243d3008cb9
9 changes: 5 additions & 4 deletions trunk/arch/arm/plat-omap/mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,11 @@ static int omap_mbox_startup(struct omap_mbox *mbox)

return 0;

fail_alloc_rxq:
fail_alloc_rxq:
mbox_queue_free(mbox->txq);
fail_alloc_txq:
fail_alloc_txq:
free_irq(mbox->irq, mbox);
fail_request_irq:
fail_request_irq:
if (mbox->ops->shutdown)
mbox->ops->shutdown(mbox);

Expand Down Expand Up @@ -396,7 +396,8 @@ static int __init omap_mbox_init(void)

/* kfifo size sanity check: alignment and minimal size */
mbox_kfifo_size = ALIGN(mbox_kfifo_size, sizeof(mbox_msg_t));
mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size, sizeof(mbox_msg_t));
mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size,
sizeof(mbox_msg_t));

return 0;
}
Expand Down

0 comments on commit 0a42190

Please sign in to comment.