From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Malaterre Subject: [PATCH] video: offb: Pass actual name in offb_init_palette_hacks Date: Fri, 7 Dec 2018 13:58:42 +0100 Message-ID: <20181207125844.18775-1-malat@debian.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Sender: stable-owner@vger.kernel.org To: Rob Herring Cc: Mathieu Malaterre , stable@vger.kernel.org, Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org This is a partial revert of commit 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name"). This is the minimal work to get a Mac Mini G4 back to a bootable state. The function offb_init_palette_hacks would need to handle the case where `name` has been set to NULL. Cc: Rob Herring Fixes: 5c63e407aaab ("fbdev: Convert to using %pOFn instead of device_node.name") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Mathieu Malaterre --- drivers/video/fbdev/offb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 31f769d67195..6e75851f8142 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -648,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") == 0) address += 0x1000; - offb_init_fb(no_real_node ? "bootx" : NULL, + offb_init_fb(no_real_node ? "bootx" : dp->name, width, height, depth, pitch, address, foreign_endian, no_real_node ? NULL : dp); } -- 2.19.2