Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 359413
b: refs/heads/master
c: 940da35
h: refs/heads/master
i:
  359411: 2673a13
v: v3
  • Loading branch information
Wei Yongjun authored and Linus Torvalds committed Feb 28, 2013
1 parent 4d88210 commit 9ef9965
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 507063b2a435b24951bce8e1f67ab65cda490f1b
refs/heads/master: 940da353a83e895ea600cb8ab17dceefb1bcb469
3 changes: 2 additions & 1 deletion trunk/drivers/memstick/host/r592.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ static int r592_transfer_fifo_pio(struct r592_device *dev)
/* Executes one TPC (data is read/written from small or large fifo) */
static void r592_execute_tpc(struct r592_device *dev)
{
bool is_write = dev->req->tpc >= MS_TPC_SET_RW_REG_ADRS;
bool is_write;
int len, error;
u32 status, reg;

Expand All @@ -463,6 +463,7 @@ static void r592_execute_tpc(struct r592_device *dev)
return;
}

is_write = dev->req->tpc >= MS_TPC_SET_RW_REG_ADRS;
len = dev->req->long_data ?
dev->req->sg.length : dev->req->data_len;

Expand Down

0 comments on commit 9ef9965

Please sign in to comment.