diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /drivers/scsi/sd.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 83881dfb33c0..7b75c8a2a49d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1948,7 +1948,7 @@ static void sd_read_block_limits(struct scsi_disk *sdkp) | |||
| 1948 | { | 1948 | { |
| 1949 | struct request_queue *q = sdkp->disk->queue; | 1949 | struct request_queue *q = sdkp->disk->queue; |
| 1950 | unsigned int sector_sz = sdkp->device->sector_size; | 1950 | unsigned int sector_sz = sdkp->device->sector_size; |
| 1951 | const int vpd_len = 32; | 1951 | const int vpd_len = 64; |
| 1952 | unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL); | 1952 | unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL); |
| 1953 | 1953 | ||
| 1954 | if (!buffer || | 1954 | if (!buffer || |
| @@ -1998,7 +1998,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) | |||
| 1998 | { | 1998 | { |
| 1999 | unsigned char *buffer; | 1999 | unsigned char *buffer; |
| 2000 | u16 rot; | 2000 | u16 rot; |
| 2001 | const int vpd_len = 32; | 2001 | const int vpd_len = 64; |
| 2002 | 2002 | ||
| 2003 | buffer = kmalloc(vpd_len, GFP_KERNEL); | 2003 | buffer = kmalloc(vpd_len, GFP_KERNEL); |
| 2004 | 2004 | ||