Commit 0feed274d2dfa2162d2c37c254eede96926d3717
1 parent
05dda977f2
Exists in
master
and in
4 other branches
Revert "[SCSI] fix bsg queue oops with iscsi logout"
This reverts commit 4b6f5b3a993cbe34b4280f252bccc76967c185c8. bsg takes a reference to the underlying generic device, so it's impossible to unregister bsg in the device release routine. Acked-by: FUJITA Tomonori <tomof@acm.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
drivers/scsi/scsi_sysfs.c
| ... | ... | @@ -294,7 +294,6 @@ |
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | if (sdev->request_queue) { |
| 297 | - bsg_unregister_queue(sdev->request_queue); | |
| 298 | 297 | sdev->request_queue->queuedata = NULL; |
| 299 | 298 | /* user context needed to free queue */ |
| 300 | 299 | scsi_free_queue(sdev->request_queue); |
| ... | ... | @@ -858,6 +857,7 @@ |
| 858 | 857 | if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0) |
| 859 | 858 | return; |
| 860 | 859 | |
| 860 | + bsg_unregister_queue(sdev->request_queue); | |
| 861 | 861 | class_device_unregister(&sdev->sdev_classdev); |
| 862 | 862 | transport_remove_device(dev); |
| 863 | 863 | device_del(dev); |