diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 15:33:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-05-02 15:33:58 +1000 |
| commit | 1e24bb65dcd41d2f2593b1356fd578035d03b176 (patch) | |
| tree | 982c235470363405fe9ff3a154b25de56829c83a | |
| parent | 4a8f1dd3c0fefb9081127fcf0a5949f5eaf49d24 (diff) | |
| parent | 9341b37ec17a8793e8439e9b18354ba69556b786 (diff) | |
| download | linux-next-1e24bb65dcd41d2f2593b1356fd578035d03b176.tar.gz | |
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -rw-r--r-- | drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 | ||||
| -rw-r--r-- | drivers/ntb/test/ntb_perf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c index 9ab836d0d4f12d..079b8cd7978573 100644 --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c @@ -778,7 +778,7 @@ static void ndev_init_debugfs(struct intel_ntb_dev *ndev) ndev->debugfs_dir = debugfs_create_dir(pci_name(ndev->ntb.pdev), debugfs_dir); - if (!ndev->debugfs_dir) + if (IS_ERR(ndev->debugfs_dir)) ndev->debugfs_info = NULL; else ndev->debugfs_info = diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c index 553f1f46bc664f..72bc1d017a46ee 100644 --- a/drivers/ntb/test/ntb_perf.c +++ b/drivers/ntb/test/ntb_perf.c @@ -1227,7 +1227,7 @@ static ssize_t perf_dbgfs_read_info(struct file *filep, char __user *ubuf, "\tOut buffer addr 0x%pK\n", peer->outbuf); pos += scnprintf(buf + pos, buf_size - pos, - "\tOut buff phys addr %pa[p]\n", &peer->out_phys_addr); + "\tOut buff phys addr %pap\n", &peer->out_phys_addr); pos += scnprintf(buf + pos, buf_size - pos, "\tOut buffer size %pa\n", &peer->outbuf_size); |