Calling device_add() makes the scsi_disk visible in sysfs, the accessor routines reference sdkp->disk->queue which was not yet set properly. Fix this by initializing gendisk fields earlier in the function. Signed-off-by: Ewan D. Milne <emilne@xxxxxxxxxx> --- drivers/scsi/sd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6d2d636..97ab18b 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3428,6 +3428,13 @@ static int sd_probe(struct device *dev) goto out_free_index; } + gd->major = sd_major((index & 0xf0) >> 4); + gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00); + + gd->fops = &sd_fops; + gd->private_data = &sdkp->driver; + gd->queue = sdp->request_queue; + sdkp->device = sdp; sdkp->driver = &sd_template; sdkp->disk = gd; @@ -3456,13 +3463,6 @@ static int sd_probe(struct device *dev) get_device(dev); dev_set_drvdata(dev, sdkp); - gd->major = sd_major((index & 0xf0) >> 4); - gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00); - - gd->fops = &sd_fops; - gd->private_data = &sdkp->driver; - gd->queue = sdkp->device->request_queue; - /* defaults, until the device tells us otherwise */ sdp->sector_size = 512; sdkp->capacity = 0; -- 2.1.0
