diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-02-27 17:05:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 19:10:23 -0800 |
| commit | 940da353a83e895ea600cb8ab17dceefb1bcb469 (patch) | |
| tree | 233e9a0879f7c5b193ceb5dd32b92162c7ea8866 /drivers/memstick | |
| parent | 507063b2a435b24951bce8e1f67ab65cda490f1b (diff) | |
| download | linux-stable-940da353a83e895ea600cb8ab17dceefb1bcb469.tar.gz linux-stable-940da353a83e895ea600cb8ab17dceefb1bcb469.tar.bz2 linux-stable-940da353a83e895ea600cb8ab17dceefb1bcb469.zip | |
memstick: move the dereference below the NULL test
The dereference should be moved below the NULL test.
spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/host/r592.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index 29b2172ae18f..a7c5b31c0d50 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c @@ -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; @@ -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; |