diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2020-05-21 17:07:21 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-05-21 17:08:27 -0300 |
| commit | eafd47fc200ee759c0e8d205b9cc7342bd0f4199 (patch) | |
| tree | 1cbbe6c983c6d00a08270a68ac69a1fa8ce4de8a /drivers/bus/mhi/core/init.c | |
| parent | IB/hfi1: Enable the transmit side of the datagram ipoib netdev (diff) | |
| parent | Linux 5.7-rc6 (diff) | |
| download | linux-dev-eafd47fc200ee759c0e8d205b9cc7342bd0f4199.tar.xz linux-dev-eafd47fc200ee759c0e8d205b9cc7342bd0f4199.zip | |
Merge tag 'v5.7-rc6' into rdma.git for-next
Linux 5.7-rc6
Conflict in drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
resolved by deleting dr_cq_event, matching how netdev resolved it.
Required for dependencies in the following patches.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/bus/mhi/core/init.c')
| -rw-r--r-- | drivers/bus/mhi/core/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c index b38359c480ea..eb2ab058a01d 100644 --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -812,10 +812,9 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl, if (!mhi_cntrl) return -EINVAL; - if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put) - return -EINVAL; - - if (!mhi_cntrl->status_cb || !mhi_cntrl->link_status) + if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put || + !mhi_cntrl->status_cb || !mhi_cntrl->read_reg || + !mhi_cntrl->write_reg) return -EINVAL; ret = parse_config(mhi_cntrl, config); |