summaryrefslogtreecommitdiff
path: root/drivers/memstick
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-09-23 15:57:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 07:21:05 -0700
commitb873c2f34ecd4a5a69b41b852cbc365694541c5f (patch)
tree01daaa2aadfa8e88206129ee13d363d009df5a51 /drivers/memstick
parent3886de938cc23d5208a34064d8363d6d7b54b461 (diff)
downloadlinux-3.10-b873c2f34ecd4a5a69b41b852cbc365694541c5f.tar.gz
linux-3.10-b873c2f34ecd4a5a69b41b852cbc365694541c5f.tar.bz2
linux-3.10-b873c2f34ecd4a5a69b41b852cbc365694541c5f.zip
memstick: move dev_dbg
id_reg.if_mode might be unitialized when (*mrq)->error is nonzero. move dev_dbg() inside the if so that we are sure we can use id_reg values. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alex Dubov <oakad@yahoo.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/core/memstick.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index a5b448ea4ea..b3bf1c44d74 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -339,9 +339,9 @@ static int h_memstick_read_dev_id(struct memstick_dev *card,
card->id.type = id_reg.type;
card->id.category = id_reg.category;
card->id.class = id_reg.class;
+ dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
}
complete(&card->mrq_complete);
- dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
return -EAGAIN;
}
}