diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/scsi_lib_dma.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/scsi_lib_dma.c')
| -rw-r--r-- | drivers/scsi/scsi_lib_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c index ac6855cd2657..dcd128583b89 100644 --- a/drivers/scsi/scsi_lib_dma.c +++ b/drivers/scsi/scsi_lib_dma.c | |||
| @@ -23,7 +23,7 @@ int scsi_dma_map(struct scsi_cmnd *cmd) | |||
| 23 | int nseg = 0; | 23 | int nseg = 0; |
| 24 | 24 | ||
| 25 | if (scsi_sg_count(cmd)) { | 25 | if (scsi_sg_count(cmd)) { |
| 26 | struct device *dev = cmd->device->host->shost_gendev.parent; | 26 | struct device *dev = cmd->device->host->dma_dev; |
| 27 | 27 | ||
| 28 | nseg = dma_map_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd), | 28 | nseg = dma_map_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd), |
| 29 | cmd->sc_data_direction); | 29 | cmd->sc_data_direction); |
| @@ -41,7 +41,7 @@ EXPORT_SYMBOL(scsi_dma_map); | |||
| 41 | void scsi_dma_unmap(struct scsi_cmnd *cmd) | 41 | void scsi_dma_unmap(struct scsi_cmnd *cmd) |
| 42 | { | 42 | { |
| 43 | if (scsi_sg_count(cmd)) { | 43 | if (scsi_sg_count(cmd)) { |
| 44 | struct device *dev = cmd->device->host->shost_gendev.parent; | 44 | struct device *dev = cmd->device->host->dma_dev; |
| 45 | 45 | ||
| 46 | dma_unmap_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd), | 46 | dma_unmap_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd), |
| 47 | cmd->sc_data_direction); | 47 | cmd->sc_data_direction); |