diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:43:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:43:40 -0800 |
| commit | f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6 (patch) | |
| tree | 717e9fc0044e9d94dd363670cacc2dff9d5b4407 /drivers/mmc/mmc.c | |
| parent | [PATCH] fbcon: donīt call set_par() in fbcon_init() if vc_mode == KD_GRAPHICS (diff) | |
| parent | [MMC] mmci: kunmap_atomic() unmaps virtual address, not page (diff) | |
| download | linux-dev-f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6.tar.xz linux-dev-f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index eb41391e06e9..6696f71363b9 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -550,6 +550,11 @@ static void mmc_decode_csd(struct mmc_card *card) csd->capacity = (1 + m) << (e + 2); csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4); + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); } else { /* * We only understand CSD structure v1.1 and v1.2. @@ -579,6 +584,11 @@ static void mmc_decode_csd(struct mmc_card *card) csd->capacity = (1 + m) << (e + 2); csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4); + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); } } |