diff options
| author | Florian Fainelli <florian@openwrt.org> | 2008-07-15 10:22:28 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2008-07-15 10:22:28 +0000 |
| commit | cd21dd1a1db8dc785d31381d22460d39701762a5 (patch) | |
| tree | cf2ea47e57c1b7ba4c9ae0b7a0c895da44ef9a8b | |
| parent | 4c6a666b9036470d0c6136b53e3714e9c813311a (diff) | |
| download | upstream-cd21dd1a1db8dc785d31381d22460d39701762a5.tar.gz upstream-cd21dd1a1db8dc785d31381d22460d39701762a5.tar.bz2 upstream-cd21dd1a1db8dc785d31381d22460d39701762a5.zip | |
Fix the CF serial number byteswapping (#3133)
SVN-Revision: 11837
| -rw-r--r-- | target/linux/rb532/files/drivers/block/rb500/ata.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/target/linux/rb532/files/drivers/block/rb500/ata.c b/target/linux/rb532/files/drivers/block/rb500/ata.c index e4085c27ad..31e6782fa4 100644 --- a/target/linux/rb532/files/drivers/block/rb500/ata.c +++ b/target/linux/rb532/files/drivers/block/rb500/ata.c @@ -358,6 +358,8 @@ static int do_identify(struct cf_mips_dev *dev) u16 sbuf[CF_SECT_SIZE >> 1]; int res; char tstr[17]; //serial + char tmp; + int i; BUG_ON(dev->tstate!=TS_IDLE); dev->tbuf = (char *) sbuf; dev->tbuf_size = CF_SECT_SIZE; @@ -381,8 +383,16 @@ static int do_identify(struct cf_mips_dev *dev) dev->spt = sbuf[6]; dev->sectors = ((unsigned long) sbuf[7] << 16) | sbuf[8]; dev->dtype=sbuf[0]; - memcpy(tstr,&sbuf[12],16); - tstr[16]=0; + memcpy(tstr, &sbuf[12], 16); + tstr[16] = '\0'; + + /* Byte-swap the serial number */ + for (i = 0; i<8; i++) { + tmp = tstr[i * 2]; + tstr[i * 2] = tstr[i * 2 +1]; + tstr[i * 2 + 1] = tmp; + } + printk(KERN_INFO "cf-mips: %s detected, C/H/S=%d/%d/%d sectors=%u (%uMB) Serial=%s\n", (sbuf[0] == 0x848A ? "CF card" : "ATA drive"), dev->cyl, dev->head, dev->spt, dev->sectors, dev->sectors >> 11, tstr); |