linux-stable.git/drivers/mmc/host, branch linux-2.6.36.y

mmc: bfin_sdh: fix alloc size for private data

2011-02-17T22:47:17+00:00

commit a34650f0f1ca589cda09c48cb62baf15e680a247 upstream.

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 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: atmel-mci: fix multiblock SDIO transfers

2011-01-07T21:58:41+00:00

commit 2f1d791882d21a4002a719fb016a1ac21c8bd6b7 upstream.

Based on report made by Yauhen in:
"MMC: Fix multiblock SDIO transfers in AT91 MCI" patch,
I report those changes to the brother driver: atmel-mci.

So, this patch sets SDIO transfer types: SDIO block and SDIO byte
transfers instead of using ordinary MMC block transfers.
It is checking opcode for SDIO CMD53 and setting transfer
type in MCI_CMDR register properly.

Reported-by: Yauhen Kharuzhy 
Signed-off-by: Nicolas Ferre 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: at91_mci: fix multiblock SDIO transfers

2011-01-07T21:58:41+00:00

commit a2255ff45143001fecbc5e5a4b58fcb999d393ae upstream.

The AT91 MCI has special SDIO transfer types: SDIO block and SDIO byte
transfers, but at91_mci driver doesn't use them and handles all SDIO
transfers as ordinary MMC block transfers. This causes problems for
multiple-block SDIO transfers (in particular for 256-bytes blocks).

Fix this situation by checking the opcode for SDIO CMD53 and setting
the transfer type in the AT91_MCI_CMDR register properly.

This patch was tested with libertas SDIO driver: problem with TX
timeouts on big packets was eliminated.

Signed-off-by: Yauhen Kharuzhy 
Signed-off-by: Nicolas Ferre 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove

2010-09-26T20:27:05+00:00

If not all clocks have been defined in platform data, the driver will
cause a null pointer dereference when it is removed. This patch fixes
this issue.

Signed-off-by: Marek Szyprowski 
Signed-off-by: Kyungmin Park 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: fix incorrect spinlock usage after merge

2010-09-26T20:27:02+00:00

In the commit f522886e202a34a2191dd5d471b3c4d46410a9a0 a merge conflict
in the sdhci-s3c driver been fixed. However the fix used incorrect
spinlock operation - it caused a race with sdhci interrupt service. The
correct way to solve it is to use spin_lock_irqsave/irqrestore() calls.

Signed-off-by: Marek Szyprowski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Andrew Morton 
Signed-off-by: Chris Ball

drivers/mmc/host/imxmmc.c: adjust confusing if indentation

2010-09-10T01:57:23+00:00

Move the second if (reg & ...) test into the branch indicated by its
indentation.  The test was previously always executed after the if
containing that branch, but it was always false unless the if branch was
taken.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// 
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Chris Ball 
Cc: Pavel Pisa 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

omap hsmmc: fix a racing case between kmmcd and omap_hsmmc_suspend

2010-09-10T01:57:23+00:00

If suspend called when kmmcd is doing host->ops->disable, as kmmcd already
increased host->en_dis_recurs to 1, the mmc_host_enable in suspend
function will return directly without increase the nesting_cnt, which will
cause the followed register access carried out to the disabled host.

mmc_suspend_host will enable host itself.  No need to enable host before
it.  Also works on kmmcd will get flushed in mmc_suspend_host, enable host
after it will be safe.  So make the mmc_host_enable after it.

[cjb: rebase against current Linus]
Signed-off-by: Ethan 
Signed-off-by: Chris Ball 
Acked-by: Adrian Hunter 
Acked-by: Madhusudhan Chikkature 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: at91_mci: add missing linux/highmem.h include

2010-09-10T01:57:23+00:00

Fix the following error:

at91_mci.c: In function 'at91_mci_sg_to_dma':
at91_mci.c:236: error: implicit declaration of function 'kmap_atomic'
at91_mci.c:236: error: 'KM_BIO_SRC_IRQ' undeclared (first use in this function)
at91_mci.c:236: error: (Each undeclared identifier is reported only once
at91_mci.c:236: error: for each function it appears in.)
at91_mci.c:236: warning: assignment makes pointer from integer without a cast
at91_mci.c:252: error: implicit declaration of function 'kunmap_atomic'
at91_mci.c: In function 'at91_mci_post_dma_read':
at91_mci.c:302: error: 'KM_BIO_SRC_IRQ' undeclared (first use in this function)
at91_mci.c:302: warning: assignment makes pointer from integer without a cast
at91_mci.c:317: error: implicit declaration of function 'flush_kernel_dcache_page'

Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Chris Ball 
Cc: Nicolas Ferre 
Cc: Andrew Victor 
Cc: Wolfgang Muees 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

omap_hsmmc: remove unused local `state'

2010-09-10T01:57:23+00:00

This fixes the following warning:

drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
drivers/mmc/host/omap_hsmmc.c:2275: warning: unused variable 'state'

Introduced by commit ID:

  commit 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e
  Author: Matt Fleming 
  Date:   Wed May 26 14:42:08 2010 -0700

      mmc: remove the "state" argument to mmc_suspend_host()

The unique usage of this var was removed there, and missed
removing the respective declaration aswell.

Signed-off-by: Sergio Aguirre 
Signed-off-by: Chris Ball 
Acked-by: Matt Fleming 
Cc: Madhusudhan Chikkature 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected

2010-09-10T01:57:23+00:00

[cjb: fix line-wrapped patch]
Signed-off-by: Jiri Pinkava 
Signed-off-by: Chris Ball 
Cc: Matt Fleming 
Cc: Russell King 
Cc: Ben Dooks 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds