Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / scsi / scsi_sysfs.c

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index ad5f21fd5d450592b01dfe626465cbd45467697e..34cdce6738a6c3fe4fab28a739b7ea926788babd 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -736,7 +736,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
         * released by the sdev_class .release */
        get_device(&sdev->sdev_gendev);
 
-       error = bsg_register_queue(rq, sdev->sdev_gendev.bus_id);
+       error = bsg_register_queue(rq, &sdev->sdev_gendev, NULL);
 
        if (error)
                sdev_printk(KERN_INFO, sdev,