diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2007-08-09 07:23:56 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-09-23 15:23:07 -0400 |
commit | d84075c8aed771d47d7ac6e96b098559da361c25 (patch) | |
tree | 6c2457a49240cb6c116f0b50340be3644fc10936 /drivers/mmc/core/sd.c | |
parent | 9f2fcf99394b34769e3243a7f42a0ba8d21fc774 (diff) |
mmc: replace BUG_ON with WARN_ON
Replace all cases of BUG_ON with WARN_ON where there is a chance
(with varying degrees of slim) that the kernel can continue without
incidence.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/core/sd.c')
-rw-r--r-- | drivers/mmc/core/sd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 0a04a6e86ca1..c86588fdaae5 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
@@ -166,8 +166,6 @@ static int mmc_decode_scr(struct mmc_card *card) | |||
166 | unsigned int scr_struct; | 166 | unsigned int scr_struct; |
167 | u32 resp[4]; | 167 | u32 resp[4]; |
168 | 168 | ||
169 | BUG_ON(!mmc_card_sd(card)); | ||
170 | |||
171 | resp[3] = card->raw_scr[1]; | 169 | resp[3] = card->raw_scr[1]; |
172 | resp[2] = card->raw_scr[0]; | 170 | resp[2] = card->raw_scr[0]; |
173 | 171 | ||
@@ -300,7 +298,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, | |||
300 | unsigned int max_dtr; | 298 | unsigned int max_dtr; |
301 | 299 | ||
302 | BUG_ON(!host); | 300 | BUG_ON(!host); |
303 | BUG_ON(!host->claimed); | 301 | WARN_ON(!host->claimed); |
304 | 302 | ||
305 | /* | 303 | /* |
306 | * Since we're changing the OCR value, we seem to | 304 | * Since we're changing the OCR value, we seem to |
@@ -620,7 +618,7 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr) | |||
620 | int err; | 618 | int err; |
621 | 619 | ||
622 | BUG_ON(!host); | 620 | BUG_ON(!host); |
623 | BUG_ON(!host->claimed); | 621 | WARN_ON(!host->claimed); |
624 | 622 | ||
625 | mmc_attach_bus(host, &mmc_sd_ops); | 623 | mmc_attach_bus(host, &mmc_sd_ops); |
626 | 624 | ||