From 723381964e25fb609b2bbf203bdbe95e3f76f09a Mon Sep 17 00:00:00 2001 From: Asai Thambi S P Date: Wed, 3 Apr 2013 19:54:35 +0530 Subject: [PATCH] --- yaml --- r: 362341 b: refs/heads/master c: 6b06d35f3f63dbfde71c792b8584225f3d1fc7f2 h: refs/heads/master i: 362339: 6e65d6bb189a17f04a2ccaef1c42ab193c0786bb v: v3 --- [refs] | 2 +- trunk/drivers/block/mtip32xx/mtip32xx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e5a479a79237..20fe22a2fab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0d096b1d8b97172cee953f1a00b7d4379d398da +refs/heads/master: 6b06d35f3f63dbfde71c792b8584225f3d1fc7f2 diff --git a/trunk/drivers/block/mtip32xx/mtip32xx.c b/trunk/drivers/block/mtip32xx/mtip32xx.c index 30f233634650..ce4e47dcc153 100644 --- a/trunk/drivers/block/mtip32xx/mtip32xx.c +++ b/trunk/drivers/block/mtip32xx/mtip32xx.c @@ -4302,6 +4302,8 @@ static int mtip_pci_probe(struct pci_dev *pdev, instance++; if (rv != MTIP_FTL_REBUILD_MAGIC) set_bit(MTIP_DDF_INIT_DONE_BIT, &dd->dd_flag); + else + rv = 0; /* device in rebuild state, return 0 from probe */ goto done; block_initialize_err: