diff options
| author | Li Yang <leoyang.li@nxp.com> | 2018-10-05 13:58:35 -0500 |
|---|---|---|
| committer | Li Yang <leoyang.li@nxp.com> | 2018-10-05 13:58:35 -0500 |
| commit | 56740a7167cbbbda99ebfd3e8b4e4d51ae39bd06 (patch) | |
| tree | 0db45d0dd63acaee2a3078acc47c31d2d851c68e /drivers/soc/fsl/qbman/qman.c | |
| parent | afa86d264a7ce62ba214bc7c6012e2129141421e (diff) | |
| parent | 5a1eb8b9542884592a018829bb1ff20c9695d925 (diff) | |
| download | talos-obmc-linux-56740a7167cbbbda99ebfd3e8b4e4d51ae39bd06.tar.gz talos-obmc-linux-56740a7167cbbbda99ebfd3e8b4e4d51ae39bd06.zip | |
Merge tag 'soc-fsl-fix-v4.19-2' into HEAD
NXP/FSL SoC driver fixes for v4.19 round 2
- Fix crash of qman_portal by deferring its probe if qman is not probed
Diffstat (limited to 'drivers/soc/fsl/qbman/qman.c')
| -rw-r--r-- | drivers/soc/fsl/qbman/qman.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index ecb22749df0b..8cc015183043 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -2729,6 +2729,9 @@ static int qman_alloc_range(struct gen_pool *p, u32 *result, u32 cnt) { unsigned long addr; + if (!p) + return -ENODEV; + addr = gen_pool_alloc(p, cnt); if (!addr) return -ENOMEM; |
