diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-28 16:04:46 -0500 |
commit | 6d4915f4f289e9452d5df136a185ee3edc67c943 (patch) | |
tree | f2b46c700f5a0a3a0c5b7f89c762b7ebcd56d0f8 /arch/arm/plat-omap/mailbox.c | |
parent | 9a577aa8d55f8607e6f5ea6fb9d52780930d8373 (diff) | |
parent | 02fa9f0451ac639a687bfc145eefe58703ff220e (diff) |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into linaro-2.6.38linaro-linux-2.6.38-upstream-01Mar2011
Diffstat (limited to 'arch/arm/plat-omap/mailbox.c')
-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 459b319a9fa..49d3208793e 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); |