diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:17:19 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:19:31 +0200 |
| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /drivers/scsi/scsicam.c | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
| download | kernel-crypto-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.gz kernel-crypto-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.xz kernel-crypto-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.zip | |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/scsi/scsicam.c')
| -rw-r--r-- | drivers/scsi/scsicam.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c index b78354fc4b1..cd68a66c7bb 100644 --- a/drivers/scsi/scsicam.c +++ b/drivers/scsi/scsicam.c @@ -57,6 +57,7 @@ EXPORT_SYMBOL(scsi_bios_ptable); int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip) { unsigned char *p; + u64 capacity64 = capacity; /* Suppress gcc warning */ int ret; p = scsi_bios_ptable(bdev); @@ -68,7 +69,7 @@ int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip) (unsigned int *)ip + 0, (unsigned int *)ip + 1); kfree(p); - if (ret == -1) { + if (ret == -1 && capacity64 < (1ULL << 32)) { /* pick some standard mapping with at most 1024 cylinders, and at most 62 sectors per track - this works up to 7905 MB */ |