diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:22:25 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-10-12 11:43:29 +0100 |
| commit | 220c71dafaa28cbb75fd785670cf68a758347026 (patch) | |
| tree | 47a974cd3ea71ba59116037b56a509c41a430b63 /drivers/firmware/sysfb.c | |
| parent | 6a9262edff8ea44e9968b6b271c36d81c6a1f841 (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
Merge tag 'v6.12-rc2' into test2
Linux 6.12-rc2
Resolved movement of asm/unaligned.h to linux/unaligned.h
Diffstat (limited to 'drivers/firmware/sysfb.c')
| -rw-r--r-- | drivers/firmware/sysfb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 02a07d3d0d40..a3df782fa687 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -67,9 +67,11 @@ static bool sysfb_unregister(void) void sysfb_disable(struct device *dev) { struct screen_info *si = &screen_info; + struct device *parent; mutex_lock(&disable_lock); - if (!dev || dev == sysfb_parent_dev(si)) { + parent = sysfb_parent_dev(si); + if (!dev || !parent || dev == parent) { sysfb_unregister(); disabled = true; } |