[-next] Input: synaptics-rmi4 - fix the error return code in rmi_probe_interrupts()
diff mbox

Message ID 1528336085-13983-1-git-send-email-weiyongjun1@huawei.com
State Accepted
Headers show

Commit Message

Wei Yongjun June 7, 2018, 1:48 a.m. UTC
The error return code PTR_ERR(data->irqdomain) is always 0 since
data->irqdomain is equal to NULL in this error handling case.

Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to irq_domain")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/input/rmi4/rmi_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Lyude Paul June 7, 2018, 4:22 p.m. UTC | #1
Reviewed-by: Lyude Paul <lyude@redhat.com>

On Thu, 2018-06-07 at 01:48 +0000, Wei Yongjun wrote:
> The error return code PTR_ERR(data->irqdomain) is always 0 since
> data->irqdomain is equal to NULL in this error handling case.
> 
> Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to
> irq_domain")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
>  drivers/input/rmi4/rmi_driver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/input/rmi4/rmi_driver.c
> b/drivers/input/rmi4/rmi_driver.c
> index 2fb0ae0..cb6d983 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -1043,7 +1043,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
>  						   data);
>  	if (!data->irqdomain) {
>  		dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
> -		return PTR_ERR(data->irqdomain);
> +		return -ENOMEM;
>  	}
>  
>  	data->irq_count = irq_count;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nick Desaulniers June 7, 2018, 9:15 p.m. UTC | #2
On Thu, Jun 7, 2018 at 9:22 AM, Lyude Paul <lyude@redhat.com> wrote:
> Reviewed-by: Lyude Paul <lyude@redhat.com>
>
> On Thu, 2018-06-07 at 01:48 +0000, Wei Yongjun wrote:
>> The error return code PTR_ERR(data->irqdomain) is always 0 since
>> data->irqdomain is equal to NULL in this error handling case.
>>
>> Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to
>> irq_domain")
>> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
>> ---
>>  drivers/input/rmi4/rmi_driver.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/input/rmi4/rmi_driver.c
>> b/drivers/input/rmi4/rmi_driver.c
>> index 2fb0ae0..cb6d983 100644
>> --- a/drivers/input/rmi4/rmi_driver.c
>> +++ b/drivers/input/rmi4/rmi_driver.c
>> @@ -1043,7 +1043,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
>>                                                  data);
>>       if (!data->irqdomain) {
>>               dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
>> -             return PTR_ERR(data->irqdomain);
>> +             return -ENOMEM;
>>       }
>>
>>       data->irq_count = irq_count;
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> Cheers,
>         Lyude Paul

Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nick Desaulniers June 7, 2018, 9:16 p.m. UTC | #3
On Thu, Jun 7, 2018 at 2:15 PM, Nick Desaulniers
<nick.desaulniers@gmail.com> wrote:
> On Thu, Jun 7, 2018 at 9:22 AM, Lyude Paul <lyude@redhat.com> wrote:
>> Reviewed-by: Lyude Paul <lyude@redhat.com>
>>
>> On Thu, 2018-06-07 at 01:48 +0000, Wei Yongjun wrote:
>>> The error return code PTR_ERR(data->irqdomain) is always 0 since
>>> data->irqdomain is equal to NULL in this error handling case.
>>>
>>> Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to
>>> irq_domain")
>>> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
>>> ---
>>>  drivers/input/rmi4/rmi_driver.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/input/rmi4/rmi_driver.c
>>> b/drivers/input/rmi4/rmi_driver.c
>>> index 2fb0ae0..cb6d983 100644
>>> --- a/drivers/input/rmi4/rmi_driver.c
>>> +++ b/drivers/input/rmi4/rmi_driver.c
>>> @@ -1043,7 +1043,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
>>>                                                  data);
>>>       if (!data->irqdomain) {
>>>               dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
>>> -             return PTR_ERR(data->irqdomain);
>>> +             return -ENOMEM;
>>>       }
>>>
>>>       data->irq_count = irq_count;
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> --
>> Cheers,
>>         Lyude Paul
>
> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

Sorry, that probably should have been a

Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

hopefully that doesn't mess up any maintainers' automated scripts.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov June 11, 2018, 5:10 p.m. UTC | #4
On Thu, Jun 07, 2018 at 02:16:43PM -0700, Nick Desaulniers wrote:
> On Thu, Jun 7, 2018 at 2:15 PM, Nick Desaulniers
> <nick.desaulniers@gmail.com> wrote:
> > On Thu, Jun 7, 2018 at 9:22 AM, Lyude Paul <lyude@redhat.com> wrote:
> >> Reviewed-by: Lyude Paul <lyude@redhat.com>
> >>
> >> On Thu, 2018-06-07 at 01:48 +0000, Wei Yongjun wrote:
> >>> The error return code PTR_ERR(data->irqdomain) is always 0 since
> >>> data->irqdomain is equal to NULL in this error handling case.
> >>>
> >>> Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to
> >>> irq_domain")
> >>> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> >>> ---
> >>>  drivers/input/rmi4/rmi_driver.c | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/input/rmi4/rmi_driver.c
> >>> b/drivers/input/rmi4/rmi_driver.c
> >>> index 2fb0ae0..cb6d983 100644
> >>> --- a/drivers/input/rmi4/rmi_driver.c
> >>> +++ b/drivers/input/rmi4/rmi_driver.c
> >>> @@ -1043,7 +1043,7 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
> >>>                                                  data);
> >>>       if (!data->irqdomain) {
> >>>               dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
> >>> -             return PTR_ERR(data->irqdomain);
> >>> +             return -ENOMEM;
> >>>       }
> >>>
> >>>       data->irq_count = irq_count;
> >>>
> >>> --
> >>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> >>> the body of a message to majordomo@vger.kernel.org
> >>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >> --
> >> Cheers,
> >>         Lyude Paul
> >
> > Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
> 
> Sorry, that probably should have been a
> 
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> 
> hopefully that doesn't mess up any maintainers' automated scripts.

Applied, thank you.

Patch
diff mbox

diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 2fb0ae0..cb6d983 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -1043,7 +1043,7 @@  int rmi_probe_interrupts(struct rmi_driver_data *data)
 						   data);
 	if (!data->irqdomain) {
 		dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
-		return PTR_ERR(data->irqdomain);
+		return -ENOMEM;
 	}
 
 	data->irq_count = irq_count;