diff options
| author | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
| commit | 7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch) | |
| tree | af626c941574ea68f7d74da04d81e302fbc14a68 /drivers/mtd/nand/raw/denali.c | |
| parent | MAINTAINERS: remove myself as staging FBTFT maintainer (diff) | |
| parent | Linux 4.19-rc4 (diff) | |
| download | kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.gz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip | |
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mtd/nand/raw/denali.c')
| -rw-r--r-- | drivers/mtd/nand/raw/denali.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index ca18612c4201..67b2065e7a19 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1338,6 +1338,11 @@ int denali_init(struct denali_nand_info *denali) denali_enable_irq(denali); denali_reset_banks(denali); + if (!denali->max_banks) { + /* Error out earlier if no chip is found for some reasons. */ + ret = -ENODEV; + goto disable_irq; + } denali->active_bank = DENALI_INVALID_BANK; |