[PATCH] video: ARM CLCD: fix Vexpress regression

Linus Walleij linus.walleij at linaro.org
Thu Nov 3 02:25:51 PDT 2016


On Wed, Nov 2, 2016 at 9:34 AM, Tomi Valkeinen <tomi.valkeinen at ti.com> wrote:
> On 20/10/16 09:46, Linus Walleij wrote:
>> The CLCD does not come up on Versatile Express as it does not
>> (currently) have a syscon node for controlling the block apart
>> from the CLCD itself. Make sure the .init() function can bail
>> out without an error making it probe again.
>>
>> Reported-by: Amit Pundir <amit.pundir at linaro.org>
>> Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
>> ---
>>  drivers/video/fbdev/amba-clcd-versatile.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c
>> index 19ad8645d93c..d909b7dda14d 100644
>> --- a/drivers/video/fbdev/amba-clcd-versatile.c
>> +++ b/drivers/video/fbdev/amba-clcd-versatile.c
>> @@ -527,7 +527,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb,
>>                                            &clcd_id);
>>       if (!np) {
>>               dev_err(dev, "no Versatile syscon node\n");
>> -             return -ENODEV;
>> +             /* Vexpress does not have this */
>> +             return 0;
>>       }
>>       versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
>
> Actually, the above doesn't look correct. If this is not an error, then
> the driver shouldn't print an error.
>
> Shall I just remove the print?

You're right, sorry for not thinking deeper :(

Just cut the print.

Thanks!

Yours,
Linus Walleij



More information about the linux-arm-kernel mailing list