aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS3
-rw-r--r--arch/s390/lib/string.c15
2 files changed, 8 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1bd721478800..c79388b78818 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10279,7 +10279,6 @@ KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
M: Christian Borntraeger <[email protected]>
M: Janosch Frank <[email protected]>
R: David Hildenbrand <[email protected]>
-R: Cornelia Huck <[email protected]>
R: Claudio Imbrenda <[email protected]>
S: Supported
@@ -16302,6 +16301,7 @@ S390
M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
M: Christian Borntraeger <[email protected]>
+R: Alexander Gordeev <[email protected]>
S: Supported
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -16380,7 +16380,6 @@ F: drivers/s390/crypto/vfio_ap_ops.c
F: drivers/s390/crypto/vfio_ap_private.h
S390 VFIO-CCW DRIVER
-M: Cornelia Huck <[email protected]>
M: Eric Farman <[email protected]>
M: Matthew Rosato <[email protected]>
R: Halil Pasic <[email protected]>
diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index cfcdf76d6a95..a95ca6df4e5e 100644
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -259,14 +259,13 @@ EXPORT_SYMBOL(strcmp);
#ifdef __HAVE_ARCH_STRRCHR
char *strrchr(const char *s, int c)
{
- size_t len = __strend(s) - s;
-
- if (len)
- do {
- if (s[len] == (char) c)
- return (char *) s + len;
- } while (--len > 0);
- return NULL;
+ ssize_t len = __strend(s) - s;
+
+ do {
+ if (s[len] == (char)c)
+ return (char *)s + len;
+ } while (--len >= 0);
+ return NULL;
}
EXPORT_SYMBOL(strrchr);
#endif