2020-07-24 06:30:29

by Jiri Slaby

[permalink] [raw]
Subject: [PATCH] newport_con: vc_color is now in state

Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
vc->state.color. Somehow both me and 0-day bot missed this driver during
the conversion.

So fix the driver now.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/video/console/newport_con.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index df3c52d72159..72f146d047d9 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -362,12 +362,12 @@ static void newport_clear(struct vc_data *vc, int sy, int sx, int height,

if (ystart < yend) {
newport_clear_screen(sx << 3, ystart, xend, yend,
- (vc->vc_color & 0xf0) >> 4);
+ (vc->state.color & 0xf0) >> 4);
} else {
newport_clear_screen(sx << 3, ystart, xend, 1023,
- (vc->vc_color & 0xf0) >> 4);
+ (vc->state.color & 0xf0) >> 4);
newport_clear_screen(sx << 3, 0, xend, yend,
- (vc->vc_color & 0xf0) >> 4);
+ (vc->state.color & 0xf0) >> 4);
}
}

@@ -591,11 +591,11 @@ static bool newport_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
topscan = (topscan + (lines << 4)) & 0x3ff;
newport_clear_lines(vc->vc_rows - lines,
vc->vc_rows - 1,
- (vc->vc_color & 0xf0) >> 4);
+ (vc->state.color & 0xf0) >> 4);
} else {
topscan = (topscan + (-lines << 4)) & 0x3ff;
newport_clear_lines(0, lines - 1,
- (vc->vc_color & 0xf0) >> 4);
+ (vc->state.color & 0xf0) >> 4);
}
npregs->cset.topscan = (topscan - 1) & 0x3ff;
return false;
--
2.27.0


2020-07-24 07:59:34

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] newport_con: vc_color is now in state

On Fri, Jul 24, 2020 at 08:27:35AM +0200, Jiri Slaby wrote:
> Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
> vc->state.color. Somehow both me and 0-day bot missed this driver during
> the conversion.
>
> So fix the driver now.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Bartlomiej Zolnierkiewicz <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/video/console/newport_con.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)

You forgot the "Reported-by:" line :(

I'll go add it, thanks for the fix.

greg k-h

2020-07-24 08:00:09

by Jiri Slaby

[permalink] [raw]
Subject: Re: [PATCH] newport_con: vc_color is now in state

On 24. 07. 20, 9:58, Greg KH wrote:
> On Fri, Jul 24, 2020 at 08:27:35AM +0200, Jiri Slaby wrote:
>> Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
>> vc->state.color. Somehow both me and 0-day bot missed this driver during
>> the conversion.
>>
>> So fix the driver now.
>>
>> Signed-off-by: Jiri Slaby <[email protected]>
>> Cc: Bartlomiej Zolnierkiewicz <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
>> drivers/video/console/newport_con.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> You forgot the "Reported-by:" line :(

Ah, I didn't know/notice. Will do next time. Thanks.


--
js
suse labs

2020-07-24 09:33:08

by Sergei Shtylyov

[permalink] [raw]
Subject: Re: [PATCH] newport_con: vc_color is now in state

On 24.07.2020 9:27, Jiri Slaby wrote:

> Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as

Cgit says "Bad object id: 28bc24fc46f9" (in Linus' repo). Also, you should
enclose the commit summary in (""), not just ()...

> vc->state.color. Somehow both me and 0-day bot missed this driver during
> the conversion.
>
> So fix the driver now.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Bartlomiej Zolnierkiewicz <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
[...]

MBR, Sergei

2020-07-24 09:42:01

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] newport_con: vc_color is now in state

On Fri, Jul 24, 2020 at 12:30:59PM +0300, Sergei Shtylyov wrote:
> On 24.07.2020 9:27, Jiri Slaby wrote:
>
> > Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
>
> Cgit says "Bad object id: 28bc24fc46f9" (in Linus' repo). Also, you should
> enclose the commit summary in (""), not just ()...

I've added the proper "Fixes:" tag when committing this, no worries.

greg k-h

2020-07-24 10:31:35

by Jiri Slaby

[permalink] [raw]
Subject: Re: [PATCH] newport_con: vc_color is now in state

On 24. 07. 20, 11:30, Sergei Shtylyov wrote:
> On 24.07.2020 9:27, Jiri Slaby wrote:
>
>> Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
>
>    Cgit says "Bad object id: 28bc24fc46f9" (in Linus' repo).

That's because it's not in Linus' repo yet.

--
js
suse labs