diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 19:38:18 -0500 |
| commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
| tree | b384aef82007144b067cc171d2a9aa168b50b262 /drivers/mmc/omap.c | |
| parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
| parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'drivers/mmc/omap.c')
| -rw-r--r-- | drivers/mmc/omap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 762fa2895891..d593ef342e75 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -640,8 +640,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data) | |||
| 640 | } | 640 | } |
| 641 | 641 | ||
| 642 | /* Max limit for DMA frame count is 0xffff */ | 642 | /* Max limit for DMA frame count is 0xffff */ |
| 643 | if (unlikely(count > 0xffff)) | 643 | BUG_ON(count > 0xffff); |
| 644 | BUG(); | ||
| 645 | 644 | ||
| 646 | OMAP_MMC_WRITE(host->base, BUF, buf); | 645 | OMAP_MMC_WRITE(host->base, BUF, buf); |
| 647 | omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16, | 646 | omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16, |