diff options
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c')
-rw-r--r-- | drivers/scsi/device_handler/scsi_dh_rdac.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 268189d31d9..be362adbd8e 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c | |||
@@ -568,7 +568,8 @@ done: | |||
568 | return err; | 568 | return err; |
569 | } | 569 | } |
570 | 570 | ||
571 | static int rdac_activate(struct scsi_device *sdev) | 571 | static int rdac_activate(struct scsi_device *sdev, |
572 | activate_complete fn, void *data) | ||
572 | { | 573 | { |
573 | struct rdac_dh_data *h = get_rdac_data(sdev); | 574 | struct rdac_dh_data *h = get_rdac_data(sdev); |
574 | int err = SCSI_DH_OK; | 575 | int err = SCSI_DH_OK; |
@@ -580,7 +581,9 @@ static int rdac_activate(struct scsi_device *sdev) | |||
580 | if (h->lun_state == RDAC_LUN_UNOWNED) | 581 | if (h->lun_state == RDAC_LUN_UNOWNED) |
581 | err = send_mode_select(sdev, h); | 582 | err = send_mode_select(sdev, h); |
582 | done: | 583 | done: |
583 | return err; | 584 | if (fn) |
585 | fn(data, err); | ||
586 | return 0; | ||
584 | } | 587 | } |
585 | 588 | ||
586 | static int rdac_prep_fn(struct scsi_device *sdev, struct request *req) | 589 | static int rdac_prep_fn(struct scsi_device *sdev, struct request *req) |