diff options
| author | Wei Yongjun <[email protected]> | 2013-05-07 13:46:36 +0000 |
|---|---|---|
| committer | Scott Wood <[email protected]> | 2013-07-30 20:50:08 +0000 |
| commit | f8dc6eb757c3351e282678528d052f7a4c0e44c9 (patch) | |
| tree | 17f3afcb59ccc380273be6ec9d053c4b2af35fe0 | |
| parent | powerpc/85xx: Add machine check handler to fix PCIe erratum on mpc85xx (diff) | |
| download | kernel-f8dc6eb757c3351e282678528d052f7a4c0e44c9.tar.gz kernel-f8dc6eb757c3351e282678528d052f7a4c0e44c9.zip | |
powerpc/fsl_msi: fix error return code in fsl_of_msi_probe()
Fix to return a negative error code in the MSI bitmap alloc error
handling case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <[email protected]>
Signed-off-by: Scott Wood <[email protected]>
| -rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index ab02db3d02d8..f45556aa884c 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c @@ -370,7 +370,6 @@ static int fsl_of_msi_probe(struct platform_device *dev) struct fsl_msi *msi; struct resource res; int err, i, j, irq_index, count; - int rc; const u32 *p; const struct fsl_msi_feature *features; int len; @@ -431,8 +430,8 @@ static int fsl_of_msi_probe(struct platform_device *dev) */ msi->phandle = dev->dev.of_node->phandle; - rc = fsl_msi_init_allocator(msi); - if (rc) { + err = fsl_msi_init_allocator(msi); + if (err) { dev_err(&dev->dev, "Error allocating MSI bitmap\n"); goto error_out; } |