diff --git a/[refs] b/[refs] index 679e66ff27af..b621bce0b7ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986d75843555d0f6bc4acd11276c7f8f77d246b8 +refs/heads/master: 69f452635cf863f9356996218d25bbe2a4e35f2d diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/names.c b/trunk/drivers/staging/usbip/userspace/libsrc/names.c index 3b151dff85a6..72480fb9976e 100644 --- a/trunk/drivers/staging/usbip/userspace/libsrc/names.c +++ b/trunk/drivers/staging/usbip/userspace/libsrc/names.c @@ -491,10 +491,10 @@ static void parse(FILE *f) while (fgets(buf, sizeof(buf), f)) { linectr++; /* remove line ends */ - cp = strchr(buf, 13); + cp = strchr(buf, '\r'); if (cp) *cp = 0; - cp = strchr(buf, 10); + cp = strchr(buf, '\n'); if (cp) *cp = 0; if (buf[0] == '#' || !buf[0])