aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi/zfcp_aux.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
-rw-r--r--drivers/s390/scsi/zfcp_aux.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 572dcd67e713..7a50f64c36bd 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -517,6 +517,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
517 goto qdio_mem_failed; 517 goto qdio_mem_failed;
518 518
519 adapter->qdio->adapter = adapter; 519 adapter->qdio->adapter = adapter;
520
520 ccw_device->handler = NULL; 521 ccw_device->handler = NULL;
521 adapter->ccw_device = ccw_device; 522 adapter->ccw_device = ccw_device;
522 atomic_set(&adapter->refcount, 0); 523 atomic_set(&adapter->refcount, 0);
@@ -530,7 +531,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
530 if (zfcp_reqlist_alloc(adapter)) 531 if (zfcp_reqlist_alloc(adapter))
531 goto failed_low_mem_buffers; 532 goto failed_low_mem_buffers;
532 533
533 if (zfcp_adapter_debug_register(adapter)) 534 if (zfcp_dbf_adapter_register(adapter))
534 goto debug_register_failed; 535 goto debug_register_failed;
535 536
536 if (zfcp_setup_adapter_work_queue(adapter)) 537 if (zfcp_setup_adapter_work_queue(adapter))
@@ -577,7 +578,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
577sysfs_failed: 578sysfs_failed:
578 zfcp_destroy_adapter_work_queue(adapter); 579 zfcp_destroy_adapter_work_queue(adapter);
579work_queue_failed: 580work_queue_failed:
580 zfcp_adapter_debug_unregister(adapter); 581 zfcp_dbf_adapter_unregister(adapter->dbf);
581debug_register_failed: 582debug_register_failed:
582 dev_set_drvdata(&ccw_device->dev, NULL); 583 dev_set_drvdata(&ccw_device->dev, NULL);
583 kfree(adapter->req_list); 584 kfree(adapter->req_list);
@@ -616,7 +617,7 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
616 return; 617 return;
617 618
618 zfcp_destroy_adapter_work_queue(adapter); 619 zfcp_destroy_adapter_work_queue(adapter);
619 zfcp_adapter_debug_unregister(adapter); 620 zfcp_dbf_adapter_unregister(adapter->dbf);
620 zfcp_qdio_free(adapter->qdio); 621 zfcp_qdio_free(adapter->qdio);
621 zfcp_free_low_mem_buffers(adapter); 622 zfcp_free_low_mem_buffers(adapter);
622 kfree(adapter->req_list); 623 kfree(adapter->req_list);