diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-29 15:10:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-29 15:10:18 +1100 |
| commit | fafa2d7820e468b05cdc51b67121e81bc76c8111 (patch) | |
| tree | 304d9ce1e5349a4e6fdc3706cebadfded86883b4 /drivers | |
| parent | 29dce1fd33b33139d3249c6d44fdc67ef0796a10 (diff) | |
| parent | 0feed274d2dfa2162d2c37c254eede96926d3717 (diff) | |
Merge commit 'scsi-rc-fixes/master'
Conflicts:
drivers/scsi/scsi_sysfs.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 4e1e7ade819f..67bb20ed45d2 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -303,7 +303,6 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) } if (sdev->request_queue) { - bsg_unregister_queue(sdev->request_queue); sdev->request_queue->queuedata = NULL; /* user context needed to free queue */ scsi_free_queue(sdev->request_queue); @@ -878,6 +877,7 @@ void __scsi_remove_device(struct scsi_device *sdev) if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0) return; + bsg_unregister_queue(sdev->request_queue); device_unregister(&sdev->sdev_dev); transport_remove_device(dev); device_del(dev); |