From e6b7720a76f19adc34f1e15a3b4173fbf866f658 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 10 Oct 2008 22:39:22 +0200 Subject: [PATCH] --- yaml --- r: 112871 b: refs/heads/master c: 1a7809e3499921a016d203b9ee51a77d3cc1dc98 h: refs/heads/master i: 112869: 9b0f4bae67fab192ebe0d31feed8569872776265 112867: 15e7be769e73ec033e89b897ab7278e83e787f62 112863: da76ba7f76e31e619dc39b81b644e0802d16b868 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-iops.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dcfd242b8070..1f5111fbd089 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c619ffd48d7fdb3b17f0df67c4eb4b0bd80e253 +refs/heads/master: 1a7809e3499921a016d203b9ee51a77d3cc1dc98 diff --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c index 8cfa6125c7a4..004803030f64 100644 --- a/trunk/drivers/ide/ide-iops.c +++ b/trunk/drivers/ide/ide-iops.c @@ -423,14 +423,16 @@ void ide_fix_driveid(u16 *id) void ide_fixstring (u8 *s, const int bytecount, const int byteswap) { - u8 *p = s, *end = &s[bytecount & ~1]; /* bytecount must be even */ + u8 *p, *end = &s[bytecount & ~1]; /* bytecount must be even */ if (byteswap) { /* convert from big-endian to host byte order */ - for (p = end ; p != s;) - be16_to_cpus((u16 *)(p -= 2)); + for (p = s ; p != end ; p += 2) + be16_to_cpus((u16 *) p); } + /* strip leading blanks */ + p = s; while (s != end && *s == ' ') ++s; /* compress internal blanks and strip trailing blanks */