diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-25 03:30:51 (GMT) |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-09-25 03:30:51 (GMT) |
commit | de0138da0f8cf406c096daec7494a5cbebce2e5c (patch) | |
tree | 337c9cf8b3ada88ac6bf9aecfa36c8ad759ea4bd /drivers/char/hvc_iseries.c | |
parent | ef26a46f8c501f6888cc78bcc4a2dc1efea1e733 (diff) | |
download | linux-de0138da0f8cf406c096daec7494a5cbebce2e5c.tar.xz |
[POWERPC] The two vio HVC backends clash
Make sure only one of them actually registers as a driver.
Also, remove cast from get_property().
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers/char/hvc_iseries.c')
-rw-r--r-- | drivers/char/hvc_iseries.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index 4747729..ea36201 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c @@ -29,6 +29,7 @@ #include <asm/hvconsole.h> #include <asm/vio.h> #include <asm/prom.h> +#include <asm/firmware.h> #include <asm/iseries/vio.h> #include <asm/iseries/hv_call.h> #include <asm/iseries/hv_lp_config.h> @@ -493,6 +494,9 @@ static int hvc_vio_init(void) atomic_t wait_flag; int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -EIO; + /* +2 for fudge */ rc = viopath_open(HvLpConfig_getPrimaryLpIndex(), viomajorsubtype_chario, VIOCHAR_WINDOW + 2); @@ -567,7 +571,7 @@ static int hvc_find_vtys(void) for (vty = of_find_node_by_name(NULL, "vty"); vty != NULL; vty = of_find_node_by_name(vty, "vty")) { - uint32_t *vtermno; + const uint32_t *vtermno; /* We have statically defined space for only a certain number * of console adapters. @@ -576,7 +580,7 @@ static int hvc_find_vtys(void) (num_found >= VTTY_PORTS)) break; - vtermno = (uint32_t *)get_property(vty, "reg", NULL); + vtermno = get_property(vty, "reg", NULL); if (!vtermno) continue; |