From: Benjamin Herrenschmidt Date: Mon, 7 Nov 2005 05:57:33 +0000 (+1100) Subject: [PATCH] ppc: Fix PowerBook HD led on ARCH=powerpc X-Git-Tag: v2.6.15-rc1~421^2~9 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=42596ec5edc8efb9e24397ef656df7ebb2c4f8d5;p=~emulex%2Finfiniband.git [PATCH] ppc: Fix PowerBook HD led on ARCH=powerpc The PowerBook HD led code uses obsoletes device-tree accessors which do not work anymore for getting the root of the tree. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index d8c3d8ebad3..b3e65a65d20 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -497,16 +497,19 @@ pmu_hd_blink_init(void) if (pmu_get_model() != PMU_KEYLARGO_BASED) return 0; - dt = find_devices("device-tree"); + dt = of_find_node_by_path("/"); if (dt == NULL) return 0; model = (const char *)get_property(dt, "model", NULL); if (model == NULL) return 0; if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && - strncmp(model, "iBook", strlen("iBook")) != 0) + strncmp(model, "iBook", strlen("iBook")) != 0) { + of_node_put(dt); return 0; - + } + of_node_put(dt); + pmu_blink_on.complete = 1; pmu_blink_off.complete = 1; spin_lock_init(&pmu_blink_lock);