diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /drivers/usb/gadget/usbstring.c | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'drivers/usb/gadget/usbstring.c')
| -rw-r--r-- | drivers/usb/gadget/usbstring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 4154be375c7..58c4d37d312 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c | |||
| @@ -38,7 +38,7 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
| 38 | uchar = (c & 0x1f) << 6; | 38 | uchar = (c & 0x1f) << 6; |
| 39 | 39 | ||
| 40 | c = (u8) *s++; | 40 | c = (u8) *s++; |
| 41 | if ((c & 0xc0) != 0xc0) | 41 | if ((c & 0xc0) != 0x80) |
| 42 | goto fail; | 42 | goto fail; |
| 43 | c &= 0x3f; | 43 | c &= 0x3f; |
| 44 | uchar |= c; | 44 | uchar |= c; |
| @@ -49,13 +49,13 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len) | |||
| 49 | uchar = (c & 0x0f) << 12; | 49 | uchar = (c & 0x0f) << 12; |
| 50 | 50 | ||
| 51 | c = (u8) *s++; | 51 | c = (u8) *s++; |
| 52 | if ((c & 0xc0) != 0xc0) | 52 | if ((c & 0xc0) != 0x80) |
| 53 | goto fail; | 53 | goto fail; |
| 54 | c &= 0x3f; | 54 | c &= 0x3f; |
| 55 | uchar |= c << 6; | 55 | uchar |= c << 6; |
| 56 | 56 | ||
| 57 | c = (u8) *s++; | 57 | c = (u8) *s++; |
| 58 | if ((c & 0xc0) != 0xc0) | 58 | if ((c & 0xc0) != 0x80) |
| 59 | goto fail; | 59 | goto fail; |
| 60 | c &= 0x3f; | 60 | c &= 0x3f; |
| 61 | uchar |= c; | 61 | uchar |= c; |