diff options
author | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2024-09-04 11:41:32 -1000 |
commit | 649e980dadee36f961738d054627225542d547a2 (patch) | |
tree | a67f0dc4ea53f03c85f5e0648f83f3ff0e4877f7 /drivers/vdpa/octeon_ep/octep_vdpa_hw.c | |
parent | a4103eacc2ab408bb65e9902f0857b219fb489de (diff) | |
parent | 2ad6d23f465a4f851e3bcf6d74c315ce7b2c205b (diff) |
Merge branch 'bpf/master' into for-6.12
Pull bpf/master to receive baebe9aaba1e ("bpf: allow passing struct
bpf_iter_<type> as kfunc arguments") and related changes in preparation for
the DSQ iterator patchset.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/vdpa/octeon_ep/octep_vdpa_hw.c')
-rw-r--r-- | drivers/vdpa/octeon_ep/octep_vdpa_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_hw.c b/drivers/vdpa/octeon_ep/octep_vdpa_hw.c index 7fa0491bb201..11bd76ae18cf 100644 --- a/drivers/vdpa/octeon_ep/octep_vdpa_hw.c +++ b/drivers/vdpa/octeon_ep/octep_vdpa_hw.c @@ -140,7 +140,7 @@ static int octep_process_mbox(struct octep_hw *oct_hw, u16 id, u16 qid, void *bu val = octep_read_sig(mbox); if ((val & 0xFFFF) != MBOX_RSP_SIG) { dev_warn(&pdev->dev, "Invalid Signature from mbox : %d response\n", id); - return ret; + return -EINVAL; } val = octep_read_sts(mbox); |