diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 03:56:04 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 03:56:04 +0400 |
| commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
| tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/sysdev/fsl_msi.c | |
| parent | 2d87e06e7477fa1467e730087b68c2f518c0fff6 (diff) | |
| parent | e96dde2b5edbc0d385ccced05fb5db68c070b0d4 (diff) | |
| download | linux-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.tar.xz | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/sysdev/fsl_msi.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index ecb5c1946d22..0bab15626ee2 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c @@ -410,6 +410,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev) msi->msi_regs = ioremap(res.start, resource_size(&res)); if (!msi->msi_regs) { + err = -ENOMEM; dev_err(&dev->dev, "could not map node %s\n", dev->dev.of_node->full_name); goto error_out; |