diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/scsi/ibmmca.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/scsi/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 9c1e6a5b5af0..9a4b69d4f4eb 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -2336,7 +2336,7 @@ static int option_setup(char *str) | |||
| 2336 | char *cur = str; | 2336 | char *cur = str; |
| 2337 | int i = 1; | 2337 | int i = 1; |
| 2338 | 2338 | ||
| 2339 | while (cur && isdigit(*cur) && i <= IM_MAX_HOSTS) { | 2339 | while (cur && isdigit(*cur) && i < IM_MAX_HOSTS) { |
| 2340 | ints[i++] = simple_strtoul(cur, NULL, 0); | 2340 | ints[i++] = simple_strtoul(cur, NULL, 0); |
| 2341 | if ((cur = strchr(cur, ',')) != NULL) | 2341 | if ((cur = strchr(cur, ',')) != NULL) |
| 2342 | cur++; | 2342 | cur++; |