diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2002-11-17 05:45:54 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2002-11-17 05:45:54 -0600 |
| commit | 0af9479edf6f498e02dfd32a81d27f91b9b0d586 (patch) | |
| tree | 346582e12d279d2e54c3fb7cdf0df990ed74ace7 | |
| parent | 39ff498d12908220237218c1f62b81938b7a9297 (diff) | |
| parent | e822432ee081ab7ee149a2129808329a5485575f (diff) | |
Merge mulgrave.(none):/home/jejb/BK/scsi-misc-2.5
into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5
| -rw-r--r-- | drivers/scsi/scsi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index d4d32e5745f9..d0cd8ee54012 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -1673,7 +1673,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length, from_length = strlen(from); strncpy(to, from, min(to_length, from_length)); - if (from_length < to_length) + if (from_length < to_length) { if (compatible) { /* * NUL terminate the string if it is short. @@ -1686,6 +1686,7 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length, strncpy(&to[from_length], spaces, to_length - from_length); } + } if (from_length > to_length) printk(KERN_WARNING "%s: %s string '%s' is too long\n", __FUNCTION__, name, from); @@ -1917,12 +1918,6 @@ int scsi_attach_device(struct scsi_device *sdev) } up_read(&scsi_devicelist_mutex); return 0; - -fail: - printk(KERN_ERR "%s: Allocation failure during SCSI scanning, " - "some SCSI devices might not be configured\n", - __FUNCTION__); - return -ENOMEM; } void scsi_detach_device(struct scsi_device *sdev) |