diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 13:12:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 13:12:39 -0400 |
| commit | 3d1343b55643d60839d711205076e75754e9126e (patch) | |
| tree | 72db9f362ee10c050abe07fc1910775f9b280de0 /drivers/mmc/core/sd_ops.c | |
| parent | a2508c0814c6d2c0259fa859a6184343b1e39ea3 (diff) | |
| parent | 460cd0589df8aa9b89599905b13c2010db627012 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc_spi: Fix mmc-over-spi regression
mmc: use common byte swap macros
mmc: fix cid and csd byte order
at91_mci: Fix bad reference
Diffstat (limited to 'drivers/mmc/core/sd_ops.c')
| -rw-r--r-- | drivers/mmc/core/sd_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c index ee4029a24efd..a6dafe62b992 100644 --- a/drivers/mmc/core/sd_ops.c +++ b/drivers/mmc/core/sd_ops.c | |||
| @@ -294,8 +294,8 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr) | |||
| 294 | if (data.error) | 294 | if (data.error) |
| 295 | return data.error; | 295 | return data.error; |
| 296 | 296 | ||
| 297 | scr[0] = ntohl(scr[0]); | 297 | scr[0] = be32_to_cpu(scr[0]); |
| 298 | scr[1] = ntohl(scr[1]); | 298 | scr[1] = be32_to_cpu(scr[1]); |
| 299 | 299 | ||
| 300 | return 0; | 300 | return 0; |
| 301 | } | 301 | } |