Skip to content

Commit

Permalink
intel_scu_ipc: fix signedness bug
Browse files Browse the repository at this point in the history
busy_loop() returns negative error code, thus change err variable
from u32 to int to properly propagate correct error code.

Also remove unneeded initialization for err and i variables.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Axel Lin authored and Linus Torvalds committed Jan 25, 2011
1 parent c723fda commit ecb5646
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/platform/x86/intel_scu_ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
{
int i, nc, bytes, d;
u32 offset = 0;
u32 err = 0;
int err;
u8 cbuf[IPC_WWBUF_SIZE] = { };
u32 *wbuf = (u32 *)&cbuf;

Expand Down Expand Up @@ -404,7 +404,7 @@ EXPORT_SYMBOL(intel_scu_ipc_update_register);
*/
int intel_scu_ipc_simple_command(int cmd, int sub)
{
u32 err = 0;
int err;

mutex_lock(&ipclock);
if (ipcdev.pdev == NULL) {
Expand Down Expand Up @@ -434,8 +434,7 @@ EXPORT_SYMBOL(intel_scu_ipc_simple_command);
int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
u32 *out, int outlen)
{
u32 err = 0;
int i = 0;
int i, err;

mutex_lock(&ipclock);
if (ipcdev.pdev == NULL) {
Expand Down

0 comments on commit ecb5646

Please sign in to comment.