diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/scsi/osst.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index d64b7178fa08..278b352ae78d 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -5868,7 +5868,8 @@ static int osst_probe(struct device *dev) | |||
| 5868 | } | 5868 | } |
| 5869 | 5869 | ||
| 5870 | /* find a free minor number */ | 5870 | /* find a free minor number */ |
| 5871 | for (i=0; os_scsi_tapes[i] && i<osst_max_dev; i++); | 5871 | for (i = 0; i < osst_max_dev && os_scsi_tapes[i]; i++) |
| 5872 | ; | ||
| 5872 | if(i >= osst_max_dev) panic ("Scsi_devices corrupt (osst)"); | 5873 | if(i >= osst_max_dev) panic ("Scsi_devices corrupt (osst)"); |
| 5873 | dev_num = i; | 5874 | dev_num = i; |
| 5874 | 5875 | ||