Skip to content

Commit

Permalink
[SCSI] qla2xxx: Correct regression in DMA-mask setting prior to alloc…
Browse files Browse the repository at this point in the history
…ations.

Jeremy Higdon noted
(http://marc.info/?l=linux-scsi&m=123262143131788&w=2) that the
rework done in commit e315cd2
was not setting the proper consistent and streaming DMA masks
prior to memory allocations.  Correct this and remove the
unnecessary prototype.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Andrew Vasquez authored and James Bottomley committed Jan 25, 2009
1 parent b872ca4 commit 53303c4
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/scsi/qla2xxx/qla_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ MODULE_PARM_DESC(ql2xextended_error_logging,

static void qla2x00_free_device(scsi_qla_host_t *);

static void qla2x00_config_dma_addressing(scsi_qla_host_t *ha);

int ql2xfdmienable=1;
module_param(ql2xfdmienable, int, S_IRUGO|S_IRUSR);
MODULE_PARM_DESC(ql2xfdmienable,
Expand Down Expand Up @@ -1242,9 +1240,8 @@ qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
* supported addressing method.
*/
static void
qla2x00_config_dma_addressing(scsi_qla_host_t *vha)
qla2x00_config_dma_addressing(struct qla_hw_data *ha)
{
struct qla_hw_data *ha = vha->hw;
/* Assume a 32bit DMA mask. */
ha->flags.enable_64bit_addressing = 0;

Expand Down Expand Up @@ -1870,6 +1867,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)

set_bit(0, (unsigned long *) ha->vp_idx_map);

qla2x00_config_dma_addressing(ha);
ret = qla2x00_mem_alloc(ha, req_length, rsp_length, &req, &rsp);
if (!ret) {
qla_printk(KERN_WARNING, ha,
Expand All @@ -1896,8 +1894,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)

pci_set_drvdata(pdev, base_vha);

qla2x00_config_dma_addressing(base_vha);

host = base_vha->host;
base_vha->req_ques[0] = req->id;
host->can_queue = req->length + 128;
Expand Down

0 comments on commit 53303c4

Please sign in to comment.