summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 20:30:18 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 20:30:18 +0000
commit9759d22c8348343b0da4e25d6150c41712686c14 (patch)
tree338b185f11d705258888a8f2318a3a3b7ea0968d /drivers/scsi/arm
parented40d0c472b136682b2fcba05f89762859c7374f (diff)
parentf0bba9f934517533acbda7329be93f55d5a01c03 (diff)
downloadop-kernel-dev-9759d22c8348343b0da4e25d6150c41712686c14.zip
op-kernel-dev-9759d22c8348343b0da4e25d6150c41712686c14.tar.gz
Merge branch 'master' into devel
Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c
Diffstat (limited to 'drivers/scsi/arm')
-rw-r--r--drivers/scsi/arm/cumana_2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 8ee01b9..c9902b5 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
{
int ret = length;
- if (length >= 11 && strcmp(buffer, "CUMANASCSI2") == 0) {
+ if (length >= 11 && strncmp(buffer, "CUMANASCSI2", 11) == 0) {
buffer += 11;
length -= 11;
OpenPOWER on IntegriCloud