* [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup
@ 2017-01-10 23:05 Shuah Khan
2017-01-11 0:27 ` Javier Martinez Canillas
0 siblings, 1 reply; 5+ messages in thread
From: Shuah Khan @ 2017-01-10 23:05 UTC (permalink / raw)
To: linux-arm-kernel
Axius clock error path returns without disabling clock and suspend clock.
Fix it to disable them before returning error.
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
drivers/usb/dwc3/dwc3-exynos.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 3e8407a..f7421c2 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -136,7 +136,8 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
if (IS_ERR(exynos->axius_clk)) {
dev_err(dev, "no AXI UpScaler clk specified\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto axius_clk_err;
}
clk_prepare_enable(exynos->axius_clk);
} else {
@@ -194,6 +195,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
regulator_disable(exynos->vdd33);
err2:
clk_disable_unprepare(exynos->axius_clk);
+axius_clk_err:
clk_disable_unprepare(exynos->susp_clk);
clk_disable_unprepare(exynos->clk);
return ret;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup
2017-01-10 23:05 [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup Shuah Khan
@ 2017-01-11 0:27 ` Javier Martinez Canillas
2017-01-11 0:30 ` Shuah Khan
0 siblings, 1 reply; 5+ messages in thread
From: Javier Martinez Canillas @ 2017-01-11 0:27 UTC (permalink / raw)
To: linux-arm-kernel
Hello Shuah,
Patch looks good to me, I've just one comment.
On 01/10/2017 08:05 PM, Shuah Khan wrote:
> Axius clock error path returns without disabling clock and suspend clock.
> Fix it to disable them before returning error.
>
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---
> drivers/usb/dwc3/dwc3-exynos.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
> index 3e8407a..f7421c2 100644
> --- a/drivers/usb/dwc3/dwc3-exynos.c
> +++ b/drivers/usb/dwc3/dwc3-exynos.c
> @@ -136,7 +136,8 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
> exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
> if (IS_ERR(exynos->axius_clk)) {
> dev_err(dev, "no AXI UpScaler clk specified\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto axius_clk_err;
> }
> clk_prepare_enable(exynos->axius_clk);
> } else {
> @@ -194,6 +195,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
> regulator_disable(exynos->vdd33);
> err2:
> clk_disable_unprepare(exynos->axius_clk);
> +axius_clk_err:
This label isn't consistent with the others, I know the errN aren't great
so what about changing those to meaningful names in a preparatory patch?
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup
2017-01-11 0:27 ` Javier Martinez Canillas
@ 2017-01-11 0:30 ` Shuah Khan
2017-01-11 0:32 ` Javier Martinez Canillas
0 siblings, 1 reply; 5+ messages in thread
From: Shuah Khan @ 2017-01-11 0:30 UTC (permalink / raw)
To: linux-arm-kernel
On 01/10/2017 05:27 PM, Javier Martinez Canillas wrote:
> Hello Shuah,
>
> Patch looks good to me, I've just one comment.
>
> On 01/10/2017 08:05 PM, Shuah Khan wrote:
>> Axius clock error path returns without disabling clock and suspend clock.
>> Fix it to disable them before returning error.
>>
>> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
>> ---
>> drivers/usb/dwc3/dwc3-exynos.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
>> index 3e8407a..f7421c2 100644
>> --- a/drivers/usb/dwc3/dwc3-exynos.c
>> +++ b/drivers/usb/dwc3/dwc3-exynos.c
>> @@ -136,7 +136,8 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
>> exynos->axius_clk = devm_clk_get(dev, "usbdrd30_axius_clk");
>> if (IS_ERR(exynos->axius_clk)) {
>> dev_err(dev, "no AXI UpScaler clk specified\n");
>> - return -ENODEV;
>> + ret = -ENODEV;
>> + goto axius_clk_err;
>> }
>> clk_prepare_enable(exynos->axius_clk);
>> } else {
>> @@ -194,6 +195,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
>> regulator_disable(exynos->vdd33);
>> err2:
>> clk_disable_unprepare(exynos->axius_clk);
>> +axius_clk_err:
>
> This label isn't consistent with the others, I know the errN aren't great
> so what about changing those to meaningful names in a preparatory patch?
>
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>
> Best regards,
>
Javier,
Right they aren't consistent. Changing them all to a better naming scheme
will have be done in another cleanup patch in my opinion. I don't want to
include cleanup in this fix.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup
2017-01-11 0:30 ` Shuah Khan
@ 2017-01-11 0:32 ` Javier Martinez Canillas
2017-01-11 0:38 ` Shuah Khan
0 siblings, 1 reply; 5+ messages in thread
From: Javier Martinez Canillas @ 2017-01-11 0:32 UTC (permalink / raw)
To: linux-arm-kernel
Hello Shuah,
On 01/10/2017 09:30 PM, Shuah Khan wrote:
[snip]
>>> clk_disable_unprepare(exynos->axius_clk);
>>> +axius_clk_err:
>>
>> This label isn't consistent with the others, I know the errN aren't great
>> so what about changing those to meaningful names in a preparatory patch?
>>
>> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>
>> Best regards,
>>
>
> Javier,
>
> Right they aren't consistent. Changing them all to a better naming scheme
> will have be done in another cleanup patch in my opinion. I don't want to
> include cleanup in this fix.
>
I didn't mean to be done in the same patch, that's why I said in another
preparatory patch.
> thanks,
> -- Shuah
>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup
2017-01-11 0:32 ` Javier Martinez Canillas
@ 2017-01-11 0:38 ` Shuah Khan
0 siblings, 0 replies; 5+ messages in thread
From: Shuah Khan @ 2017-01-11 0:38 UTC (permalink / raw)
To: linux-arm-kernel
On 01/10/2017 05:32 PM, Javier Martinez Canillas wrote:
> Hello Shuah,
>
> On 01/10/2017 09:30 PM, Shuah Khan wrote:
>
> [snip]
>
>>>> clk_disable_unprepare(exynos->axius_clk);
>>>> +axius_clk_err:
>>>
>>> This label isn't consistent with the others, I know the errN aren't great
>>> so what about changing those to meaningful names in a preparatory patch?
>>>
>>> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>>
>>> Best regards,
>>>
>>
>> Javier,
>>
>> Right they aren't consistent. Changing them all to a better naming scheme
>> will have be done in another cleanup patch in my opinion. I don't want to
>> include cleanup in this fix.
>>
>
> I didn't mean to be done in the same patch, that's why I said in another
> preparatory patch.
Yes. I can send the cleanup patch.
-- Shuah
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-11 0:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-10 23:05 [PATCH] usb: dwc3-exynos fix axius clock error path to do cleanup Shuah Khan
2017-01-11 0:27 ` Javier Martinez Canillas
2017-01-11 0:30 ` Shuah Khan
2017-01-11 0:32 ` Javier Martinez Canillas
2017-01-11 0:38 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox