diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-24 11:05:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-24 11:05:43 +1000 |
| commit | d47f9580839eb6fe568e38b2084d94887fbf5ce0 (patch) | |
| tree | 2493555057f8e5c850590d7438fdbf4472666201 /drivers/accessibility | |
| parent | 3d335a523b938a445a674be24d1dd5c7a4c86fb6 (diff) | |
| parent | eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 (diff) | |
| download | linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.tar.gz linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.tar.bz2 linux-d47f9580839eb6fe568e38b2084d94887fbf5ce0.zip | |
Backmerge tag 'v6.1-rc6' into drm-next
Linux 6.1-rc6
This is needed for drm-misc-next and tegra.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/accessibility')
| -rw-r--r-- | drivers/accessibility/speakup/main.c | 2 | ||||
| -rw-r--r-- | drivers/accessibility/speakup/utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/accessibility/speakup/main.c b/drivers/accessibility/speakup/main.c index f52265293482..73db0cb44fc7 100644 --- a/drivers/accessibility/speakup/main.c +++ b/drivers/accessibility/speakup/main.c @@ -1778,7 +1778,7 @@ static void speakup_con_update(struct vc_data *vc) { unsigned long flags; - if (!speakup_console[vc->vc_num] || spk_parked) + if (!speakup_console[vc->vc_num] || spk_parked || !synth) return; if (!spin_trylock_irqsave(&speakup_info.spinlock, flags)) /* Speakup output, discard */ diff --git a/drivers/accessibility/speakup/utils.h b/drivers/accessibility/speakup/utils.h index 4bf2ee8ac246..4ce9a12f7664 100644 --- a/drivers/accessibility/speakup/utils.h +++ b/drivers/accessibility/speakup/utils.h @@ -54,7 +54,7 @@ static inline int oops(const char *msg, const char *info) static inline struct st_key *hash_name(char *name) { - u_char *pn = (u_char *)name; + unsigned char *pn = (unsigned char *)name; int hash = 0; while (*pn) { |