diff options
author | Andres Salomon <dilinger@queued.net> | 2010-11-12 01:42:06 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-03 22:02:06 -0500 |
commit | 4a3a255289e7e322b8044286cce85031990f888a (patch) | |
tree | 60afe5f0fc76b2b4edb5374023806e26fc50fb4a /drivers/sbus/char | |
parent | 301a3da358b4af84915f575479e4f0885be47b73 (diff) |
sparc: explicitly cast negative phandle checks to s32
When we switched sparc from using 'int's to 'phandle's (which is a u32), we
neglected to do anything with the various checks for -1. For those tests,
explicitly cast the phandles to s32.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r-- | drivers/sbus/char/jsflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index a624f5af4320..e8566224fe4b 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
@@ -467,7 +467,7 @@ static int jsflash_init(void) | |||
467 | 467 | ||
468 | node = prom_getchild(prom_root_node); | 468 | node = prom_getchild(prom_root_node); |
469 | node = prom_searchsiblings(node, "flash-memory"); | 469 | node = prom_searchsiblings(node, "flash-memory"); |
470 | if (node != 0 && node != -1) { | 470 | if (node != 0 && (s32)node != -1) { |
471 | if (prom_getproperty(node, "reg", | 471 | if (prom_getproperty(node, "reg", |
472 | (char *)®0, sizeof(reg0)) == -1) { | 472 | (char *)®0, sizeof(reg0)) == -1) { |
473 | printk("jsflash: no \"reg\" property\n"); | 473 | printk("jsflash: no \"reg\" property\n"); |