diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/scsi/libsrp.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/scsi/libsrp.c')
| -rw-r--r-- | drivers/scsi/libsrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c index 15e2d132e8b9..2742ae8a3d09 100644 --- a/drivers/scsi/libsrp.c +++ b/drivers/scsi/libsrp.c | |||
| @@ -135,7 +135,7 @@ int srp_target_alloc(struct srp_target *target, struct device *dev, | |||
| 135 | INIT_LIST_HEAD(&target->cmd_queue); | 135 | INIT_LIST_HEAD(&target->cmd_queue); |
| 136 | 136 | ||
| 137 | target->dev = dev; | 137 | target->dev = dev; |
| 138 | target->dev->driver_data = target; | 138 | dev_set_drvdata(target->dev, target); |
| 139 | 139 | ||
| 140 | target->srp_iu_size = iu_size; | 140 | target->srp_iu_size = iu_size; |
| 141 | target->rx_ring_size = nr; | 141 | target->rx_ring_size = nr; |