projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mmc
/
omap.c
diff --git
a/drivers/mmc/omap.c
b/drivers/mmc/omap.c
index f8830c527603228f7ba6157d1880562abe6cd755..435d331e772ada91a03a37517c35663bfefdf042 100644
(file)
--- a/
drivers/mmc/omap.c
+++ b/
drivers/mmc/omap.c
@@
-685,8
+685,7
@@
mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data)
}
/* Max limit for DMA frame count is 0xffff */
- if (unlikely(count > 0xffff))
- BUG();
+ BUG_ON(count > 0xffff);
OMAP_MMC_WRITE(host, BUF, buf);
omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16,