X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmemstick%2Fcore%2Fmemstick.c;h=a38005008a2019c7beb7f1ae32193d488438bf78;hb=6ce37a58e334ef773f88283939afc9f4965c7697;hp=7162f772bbfb92d1124042e666faa9d33609c274;hpb=17017d8d2c005734d7088d8281ce2daab8fcb097;p=linux-2.6

diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index 7162f772bb..a38005008a 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -249,8 +249,11 @@ EXPORT_SYMBOL(memstick_next_req);
  */
 void memstick_new_req(struct memstick_host *host)
 {
-	host->retries = cmd_retries;
-	host->request(host);
+	if (host->card) {
+		host->retries = cmd_retries;
+		INIT_COMPLETION(host->card->mrq_complete);
+		host->request(host);
+	}
 }
 EXPORT_SYMBOL(memstick_new_req);