Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232350
b: refs/heads/master
c: ecb5646
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Linus Torvalds committed Jan 25, 2011
1 parent 1094a06 commit ee3f29e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84
refs/heads/master: ecb5646cb098d9d1961c4b1af7b776c73b7541ac
7 changes: 3 additions & 4 deletions trunk/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 ee3f29e

Please sign in to comment.