diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-02-11 19:56:43 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-14 13:19:41 -0800 |
| commit | c03773206bf2249a890c4d420ed32ef500630095 (patch) | |
| tree | 0e07e684338994dfdb48df1a80d1ac97f7b35402 | |
| parent | eca83258f1d81575576ca553075c641849150f23 (diff) | |
| download | kernel_samsung_smdk4412-c03773206bf2249a890c4d420ed32ef500630095.zip kernel_samsung_smdk4412-c03773206bf2249a890c4d420ed32ef500630095.tar.gz kernel_samsung_smdk4412-c03773206bf2249a890c4d420ed32ef500630095.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/plat-omap/mailbox.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index 459b319..49d3208 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -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); |