From: oharboe Date: Tue, 21 Apr 2009 05:36:53 +0000 (+0000) Subject: Zach Welch fix str9x type-punned pointer X-Git-Tag: v0.2.0~1019 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=40b806bfe74e69816ee8f60da133491acadd0a33;p=openocd Zach Welch fix str9x type-punned pointer git-svn-id: svn://svn.berlios.de/openocd/trunk@1484 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- diff --git a/src/flash/str9x.c b/src/flash/str9x.c index 45a3fd67..fbba4fec 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -194,6 +194,7 @@ static int str9x_protect_check(struct flash_bank_s *bank) int i; u32 adr; u32 status = 0; + u16 hstatus = 0; if (bank->target->state != TARGET_HALTED) { @@ -212,10 +213,11 @@ static int str9x_protect_check(struct flash_bank_s *bank) { return retval; } - if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK) + if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK) { return retval; } + status = hstatus; } else { @@ -237,10 +239,11 @@ static int str9x_protect_check(struct flash_bank_s *bank) { return retval; } - if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK) + if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK) { return retval; } + status = hstatus; } /* read array command */