summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2011-04-14 15:22:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-14 16:06:56 -0700
commit59f9996555542f901f2d01ccab5c0612c8c5c480 (patch)
tree2262a4e5620454fd97a82a276a417d1eaed11674 /include
parent13209c2a52afa691ca19e7e6ebd22d4034bdfeed (diff)
downloadlinux-59f9996555542f901f2d01ccab5c0612c8c5c480.tar.gz
linux-59f9996555542f901f2d01ccab5c0612c8c5c480.tar.bz2
linux-59f9996555542f901f2d01ccab5c0612c8c5c480.zip
RapidIO/mpc85xx: fix possible mport registration problems
Fix a possible problem with mport registration left non-cleared after fsl_rio_setup() exits on link error. Abort mport initialization if registration failed. This patch is applicable to 2.6.39-rc1 only. The problem does not exist for earlier versions. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Li Yang <leoli@freescale.com> Cc: Thomas Moll <thomas.moll@sysgo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/rio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 4e37a7cfa726..4d50611112ba 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -396,7 +396,7 @@ union rio_pw_msg {
};
/* Architecture and hardware-specific functions */
-extern void rio_register_mport(struct rio_mport *);
+extern int rio_register_mport(struct rio_mport *);
extern int rio_open_inb_mbox(struct rio_mport *, void *, int, int);
extern void rio_close_inb_mbox(struct rio_mport *, int);
extern int rio_open_outb_mbox(struct rio_mport *, void *, int, int);