diff --git a/[refs] b/[refs] index f3835e3ba13d..624d55b8f6ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74315ad00b8ed41e9f97fe322942fa9883517ed1 +refs/heads/master: bb2d3de1885cd69a5fc92af99c4e0c05eb5fc122 diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 1dd4d8407694..f9995388a574 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/drivers/scsi/sd.c @@ -1948,7 +1948,7 @@ static void sd_read_block_limits(struct scsi_disk *sdkp) { struct request_queue *q = sdkp->disk->queue; unsigned int sector_sz = sdkp->device->sector_size; - const int vpd_len = 32; + const int vpd_len = 64; unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL); if (!buffer || @@ -1998,7 +1998,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) { unsigned char *buffer; u16 rot; - const int vpd_len = 32; + const int vpd_len = 64; buffer = kmalloc(vpd_len, GFP_KERNEL);