linux-stable.git/drivers/mmc, branch v2.6.38

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2011-03-09T22:00:44+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

mmc: fix CONFIG_MMC_UNSAFE_RESUME regression

2011-03-08T21:55:04+00:00

30201e7f3 ("mmc: skip detection of nonremovable cards on rescan")
allowed skipping detection of nonremovable cards on mmc_rescan().
The intention was to only skip detection of hardwired cards that
cannot be removed, so make sure this is indeed the case by directly
checking for (lack of) MMC_CAP_NONREMOVABLE, instead of using
mmc_card_is_removable(), which is overloaded with
CONFIG_MMC_UNSAFE_RESUME semantics.

The user-visible symptom of the bug this patch fixes is that no
"mmc: card XXXX removed" message appears in dmesg when a card is
removed and CONFIG_MMC_UNSAFE_RESUME=y.

Reported-and-tested-by: Dmitry Shmidt 
Reported-and-tested-by: Maxim Levitsky 
Signed-off-by: Ohad Ben-Cohen 
Signed-off-by: Chris Ball

mmc: sdio: Allow sdio operations in other threads during sdio_add_func()

2011-03-07T21:55:44+00:00

This fixes a bug introduced by 807e8e40673d ("mmc: Fix sd/sdio/mmc
initialization frequency retries") that prevented SDIO drivers from
performing SDIO commands in their probe routines -- the above patch
called mmc_claim_host() before sdio_add_func(), which causes a deadlock
if an external SDIO driver calls sdio_claim_host().

Fix tested on an OLPC XO-1.75 with libertas on SDIO.

Signed-off-by: Dmitry Shmidt 
Reviewed-and-Tested-by: Chris Ball 
Signed-off-by: Chris Ball

ARM: mmci: round down the bytes transferred on error

2011-01-31T10:53:37+00:00

We should not report incomplete blocks on error.  Return the number of
bytes successfully transferred, rounded down to the nearest block.

Acked-by: Linus Walleij 
Signed-off-by: Russell King

ARM: mmci: complete the transaction on error

2011-01-31T10:53:23+00:00

When we encounter an error, make sure we complete the transaction
otherwise we'll leave the request dangling.

Acked-by: Linus Walleij 
Signed-off-by: Russell King

ARM: 6642/1: mmci: calculate remaining bytes at error correctly

2011-01-27T22:06:12+00:00

The MMCIDATACNT register contain the number of byte left at error
not the number of words, so loose the << 2 thing. Further if CRC
fails on the first block, we may end up with a negative number
of transferred bytes which is not good, and the formula was in
wrong order.

Signed-off-by: Linus Walleij 
Signed-off-by: Russell King

mmc: bfin_sdh: fix alloc size for private data

2011-01-26T05:28:41+00:00

The bfin_sdh driver allocates the wrong size for the private data
in the mmc_host.  The first parameter of mmc_alloc_host should be
the size of the local driver struct rather than the common mmc_host.

Signed-off-by: Sonic Zhang 
Signed-off-by: Mike Frysinger 
Cc: 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: add platform_8bit_width() hook

2011-01-26T05:27:57+00:00

We have 8-bit width support but is not a v3 controller.
So we need platform_8bit_width() to support 8-bit buswidth.
Also we need MMC_CAP_8_BIT_DATA, so we add it in platdata.

This gets 8-bit support working again on s3c, after we previously
disabled 8-bit by default on non-v3 controllers.

Signed-off-by: Jaehoon Chung 
Signed-off-by: Kyungmin Park 
Signed-off-by: Chris Ball

mmc: jz4740: don't treat NULL clk as an error

2011-01-26T02:53:51+00:00

clk_get() returns a struct clk cookie to the driver and some platforms
may return NULL if they only support a single clock.  clk_get() has only
failed if it returns a ERR_PTR() encoded pointer.

Signed-off-by: Jamie Iles 
Signed-off-by: Chris Ball

mmc: mmci: don't read command response when invalid

2011-01-26T02:53:46+00:00

Don't read the command response from the registers when either the
command timed out (because there was no response from the card) or
the checksum on the response was invalid.

Signed-off-by: Russell King 
Signed-off-by: Chris Ball