Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
+9
-5
+9
-5
drivers/mmc/mmc_block.c
+9
-5
drivers/mmc/mmc_block.c
···
359
359
md->block_bits = card->csd.read_blkbits;
360
360
361
361
blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
362
-
set_capacity(md->disk, card->csd.capacity);
362
+
363
+
/*
364
+
* The CSD capacity field is in units of read_blkbits.
365
+
* set_capacity takes units of 512 bytes.
366
+
*/
367
+
set_capacity(md->disk, card->csd.capacity << (card->csd.read_blkbits - 9));
363
368
}
364
369
out:
365
370
return md;
···
378
373
379
374
mmc_card_claim_host(card);
380
375
cmd.opcode = MMC_SET_BLOCKLEN;
381
-
cmd.arg = 1 << card->csd.read_blkbits;
376
+
cmd.arg = 1 << md->block_bits;
382
377
cmd.flags = MMC_RSP_R1;
383
378
err = mmc_wait_for_cmd(card->host, &cmd, 5);
384
379
mmc_card_release_host(card);
···
417
412
if (err)
418
413
goto out;
419
414
420
-
printk(KERN_INFO "%s: %s %s %dKiB %s\n",
415
+
printk(KERN_INFO "%s: %s %s %luKiB %s\n",
421
416
md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
422
-
(card->csd.capacity << card->csd.read_blkbits) / 1024,
423
-
mmc_blk_readonly(card)?"(ro)":"");
417
+
get_capacity(md->disk) >> 1, mmc_blk_readonly(card)?"(ro)":"");
424
418
425
419
mmc_set_drvdata(card, md);
426
420
add_disk(md->disk);