diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 (patch) | |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 /drivers/scsi/sd.c | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
| parent | 2d2f8d59b14bec6c745e219a350ac51d9e00673f (diff) | |
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 98bd3aab9739..638cff41d436 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1215,7 +1215,7 @@ repeat: | |||
| 1215 | /* Either no media are present but the drive didn't tell us, | 1215 | /* Either no media are present but the drive didn't tell us, |
| 1216 | or they are present but the read capacity command fails */ | 1216 | or they are present but the read capacity command fails */ |
| 1217 | /* sdkp->media_present = 0; -- not always correct */ | 1217 | /* sdkp->media_present = 0; -- not always correct */ |
| 1218 | sdkp->capacity = 0x200000; /* 1 GB - random */ | 1218 | sdkp->capacity = 0; /* unknown mapped to zero - as usual */ |
| 1219 | 1219 | ||
| 1220 | return; | 1220 | return; |
| 1221 | } else if (the_result && longrc) { | 1221 | } else if (the_result && longrc) { |