diff options
| author | Conor Dooley <conor.dooley@microchip.com> | 2023-06-17 19:08:14 +0100 |
|---|---|---|
| committer | Conor Dooley <conor.dooley@microchip.com> | 2023-06-17 19:19:21 +0100 |
| commit | c1362fd0f2fdebf5c56d505100ba37600b5c20a5 (patch) | |
| tree | d20854c0f267807ecb3aeab41bacd51543b7ab93 /drivers/block/nbd.c | |
| parent | e2c510d6d630fe6593a0cf87531913b4b08ebeb1 (diff) | |
| parent | 318afa0812049ddaff644482b035ab861d2a920c (diff) | |
| download | linux-stable-c1362fd0f2fdebf5c56d505100ba37600b5c20a5.tar.gz linux-stable-c1362fd0f2fdebf5c56d505100ba37600b5c20a5.tar.bz2 linux-stable-c1362fd0f2fdebf5c56d505100ba37600b5c20a5.zip | |
Merge patch series "Add Sipeed Lichee Pi 4A RISC-V board support"
Jisheng Zhang <jszhang@kernel.org> says:
Sipeed's Lichee Pi 4A development board uses Lichee Module 4A core
module which is powered by T-HEAD's TH1520 SoC. Add minimal device
tree files for the core module and the development board.
Support basic uart/gpio/dmac drivers, so supports booting to a basic
shell.
This also pulls in -rc2, because of some maintainers re-jigging that
went on in the interim in commit 80e62bc8487b ("MAINTAINERS: re-sort
all entries and fields").
Link: https://lore.kernel.org/r/20230617161529.2092-1-jszhang@kernel.org
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 9c35c958f2c8..65ecde3e2a5b 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1666,7 +1666,7 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) return -EIO; dir = debugfs_create_dir(nbd_name(nbd), nbd_dbg_dir); - if (!dir) { + if (IS_ERR(dir)) { dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s'\n", nbd_name(nbd)); return -EIO; @@ -1692,7 +1692,7 @@ static int nbd_dbg_init(void) struct dentry *dbg_dir; dbg_dir = debugfs_create_dir("nbd", NULL); - if (!dbg_dir) + if (IS_ERR(dbg_dir)) return -EIO; nbd_dbg_dir = dbg_dir; |