diff mbox

acpi: method: fix incorrect shift of 64-bit integer in CRS

Message ID 1437374251-28453-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung July 20, 2015, 6:37 a.m. UTC 
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 src/acpi/method/method.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ivan Hu July 21, 2015, 4:04 a.m. UTC | #1 
On 2015年07月20日 14:37, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>   src/acpi/method/method.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index e93a644..4fbfa90 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -1653,7 +1653,7 @@ static uint64_t method_CRS_val64(const uint8_t *data)
>   {
>   	uint64_t val =
>   		((uint64_t)data[7] << 56) | ((uint64_t)data[6] << 48) |
> -		((uint64_t)data[5] << 40) | ((uint64_t)data[0] << 32) |
> +		((uint64_t)data[5] << 40) | ((uint64_t)data[4] << 32) |
>   		((uint64_t)data[3] << 24) | ((uint64_t)data[2] << 16) |
>   		((uint64_t)data[1] << 8)  | (uint64_t)data[0];
>   
Acked-by: Ivan Hu<ivan.hu@canonical.com>
Colin Ian King July 22, 2015, 9 a.m. UTC | #2 
On 20/07/15 07:37, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/method/method.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index e93a644..4fbfa90 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -1653,7 +1653,7 @@ static uint64_t method_CRS_val64(const uint8_t *data)
>  {
>  	uint64_t val =
>  		((uint64_t)data[7] << 56) | ((uint64_t)data[6] << 48) |
> -		((uint64_t)data[5] << 40) | ((uint64_t)data[0] << 32) |
> +		((uint64_t)data[5] << 40) | ((uint64_t)data[4] << 32) |
>  		((uint64_t)data[3] << 24) | ((uint64_t)data[2] << 16) |
>  		((uint64_t)data[1] << 8)  | (uint64_t)data[0];
>  
> 
Nice find, that's a typo of mine for sure.

Acked-by: Colin Ian King <colin.king@canonical.com>
diff mbox

Patch

diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index e93a644..4fbfa90 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -1653,7 +1653,7 @@  static uint64_t method_CRS_val64(const uint8_t *data)
 {
 	uint64_t val =
 		((uint64_t)data[7] << 56) | ((uint64_t)data[6] << 48) |
-		((uint64_t)data[5] << 40) | ((uint64_t)data[0] << 32) |
+		((uint64_t)data[5] << 40) | ((uint64_t)data[4] << 32) |
 		((uint64_t)data[3] << 24) | ((uint64_t)data[2] << 16) |
 		((uint64_t)data[1] << 8)  | (uint64_t)data[0];