diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /drivers/usb/gadget/usbstring.c | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
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 4154be375c7a..58c4d37d312a 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; |