diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-10-03 17:04:02 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-10-03 17:04:02 +0100 |
| commit | 97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 (patch) | |
| tree | c4f1a18b38d655b7806a72515992bd9aae14ef53 /drivers/slimbus/qcom-ctrl.c | |
| parent | 6fa964c045a6bc3321a9186e87bfbcfd1059b0f1 (diff) | |
| parent | 7860d720a84c74b2761c6b7995392a798ab0a3cb (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Daniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component match
callback functions") in order to merge the DG2 HuC patches.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/slimbus/qcom-ctrl.c')
| -rw-r--r-- | drivers/slimbus/qcom-ctrl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index f04b961b96cd..c0c4f895d76e 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -510,10 +510,8 @@ static int qcom_slim_probe(struct platform_device *pdev) } ctrl->irq = platform_get_irq(pdev, 0); - if (!ctrl->irq) { - dev_err(&pdev->dev, "no slimbus IRQ\n"); - return -ENODEV; - } + if (ctrl->irq < 0) + return ctrl->irq; sctrl = &ctrl->ctrl; sctrl->dev = &pdev->dev; |