Commit c0377320 authored Feb 11, 2011 by Kevin Hilman Committed by Tony Lindgren Feb 14, 2011

OMAP2+: mailbox: fix lookups for multiple mailboxes



The pointer math in omap_mbox_get() is not quite right, and leads to
passing NULL to strcmp() when searching for an mbox that is not first
in the list.

Convert to using array indexing as is done in all the other functions
which walk the mbox list.

Tested on OMAP2420/n810, OMAP3630/zoom3, OMAP4430/Blaze

Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent eca83258

arch/arm/plat-omap/mailbox.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -322,15 +322,18 @@ static void omap_mbox_fini(struct omap_mbox *mbox)

		struct omap_mbox omap_mbox_get(const char name, struct notifier_block *nb)
		{
		struct omap_mbox *mbox;
		int ret;
		struct omap_mbox _mbox, mbox = NULL;
		int i, ret;

		if (!mboxes)
		return ERR_PTR(-EINVAL);

		for (mbox = *mboxes; mbox; mbox++)
		if (!strcmp(mbox->name, name))
		for (i = 0; (_mbox = mboxes[i]); i++) {
		if (!strcmp(_mbox->name, name)) {
		mbox = _mbox;
		break;
		}
		}

		if (!mbox)
		return ERR_PTR(-ENOENT);