Messages in this thread | | | Subject | Re: [PATCH AUTOSEL 4.14 05/33] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw() | From | Sergey Shtylyov <> | Date | Sat, 10 Jul 2021 12:14:47 +0300 |
| |
On 10.07.2021 5:34, Sasha Levin wrote:
> From: Sergey Shtylyov <s.shtylyov@omp.ru> > > [ Upstream commit ab17122e758ef68fb21033e25c041144067975f5 ] > > After commit 6c11dc060427 ("scsi: hisi_sas: Fix IRQ checks") we have the > error codes returned by platform_get_irq() ready for the propagation > upsream in interrupt_init_v1_hw() -- that will fix still broken deferred > probing. Let's propagate the error codes from devm_request_irq() as well > since I don't see the reason to override them with -ENOENT... > > Link: https://lore.kernel.org/r/49ba93a3-d427-7542-d85a-b74fe1a33a73@omp.ru > Acked-by: John Garry <john.garry@huawei.com> > Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> > Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c > index 08eca20b0b81..8b41545ff8d9 100644 > --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c > +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c [...] > @@ -1766,7 +1766,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) > if (!irq) { > dev_err(dev, "irq init: could not map cq interrupt %d\n", > idx); > - return -ENOENT; > + return irq;
Wait! You apparently hadn't ported back the commit 6c11dc060427e07ca144eacaccd696106b361b06. Please either do that or drop this patch.
[...]
MBR, Sergey
| |