mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 12:14:06 +00:00
parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()
[ Upstream commit d46c742f82
]
As the possible failure of the kmalloc(), it should be better
to fix this error path, check and return '-ENOMEM' error code.
Signed-off-by: Li Qiong <liqiong@nfschina.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5d09232c9b
commit
826abae85c
1 changed files with 8 additions and 3 deletions
|
@ -1380,15 +1380,17 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
|
|||
}
|
||||
}
|
||||
|
||||
static void __init ccio_init_resources(struct ioc *ioc)
|
||||
static int __init ccio_init_resources(struct ioc *ioc)
|
||||
{
|
||||
struct resource *res = ioc->mmio_region;
|
||||
char *name = kmalloc(14, GFP_KERNEL);
|
||||
|
||||
if (unlikely(!name))
|
||||
return -ENOMEM;
|
||||
snprintf(name, 14, "GSC Bus [%d/]", ioc->hw_path);
|
||||
|
||||
ccio_init_resource(res, name, &ioc->ioc_regs->io_io_low);
|
||||
ccio_init_resource(res + 1, name, &ioc->ioc_regs->io_io_low_hv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int new_ioc_area(struct resource *res, unsigned long size,
|
||||
|
@ -1543,7 +1545,10 @@ static int __init ccio_probe(struct parisc_device *dev)
|
|||
return -ENOMEM;
|
||||
}
|
||||
ccio_ioc_init(ioc);
|
||||
ccio_init_resources(ioc);
|
||||
if (ccio_init_resources(ioc)) {
|
||||
kfree(ioc);
|
||||
return -ENOMEM;
|
||||
}
|
||||
hppa_dma_ops = &ccio_ops;
|
||||
|
||||
hba = kzalloc(sizeof(*hba), GFP_KERNEL);
|
||||
|
|
Loading…
Add table
Reference in a new issue