mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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 <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Matt Porter <[email protected]> Cc: Li Yang <[email protected]> Cc: Thomas Moll <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
13209c2a52
commit
59f9996555
3 changed files with 7 additions and 4 deletions
|
|
@ -1171,16 +1171,17 @@ static int rio_hdid_setup(char *str)
|
|||
|
||||
__setup("riohdid=", rio_hdid_setup);
|
||||
|
||||
void rio_register_mport(struct rio_mport *port)
|
||||
int rio_register_mport(struct rio_mport *port)
|
||||
{
|
||||
if (next_portid >= RIO_MAX_MPORTS) {
|
||||
pr_err("RIO: reached specified max number of mports\n");
|
||||
return;
|
||||
return 1;
|
||||
}
|
||||
|
||||
port->id = next_portid++;
|
||||
port->host_deviceid = rio_get_hdid(port->id);
|
||||
list_add_tail(&port->node, &rio_mports);
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(rio_local_get_device_id);
|
||||
|
|
|
|||
Loading…
Reference in a new issue