From: Hannes Reinecke Date: Mon, 24 Nov 2014 14:37:27 +0000 (+0100) Subject: esp_scsi: correctly detect am53c974 X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~21^2^2~16 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeea2f9c2f2ecc5f3217edcacc95817047b143c2;p=pandora-kernel.git esp_scsi: correctly detect am53c974 The am53c974 returns the same ID as the FAS236, but implements things slightly differently. So detect the am53c974 by checking for ESP_CONFIG4 register. Reviewed-by: Paolo Bonzini Signed-off-by: Hannes Reinecke Signed-off-by: Christoph Hellwig --- diff --git a/drivers/scsi/am53c974.c b/drivers/scsi/am53c974.c index a42e8db057a4..6e88e38bd2a4 100644 --- a/drivers/scsi/am53c974.c +++ b/drivers/scsi/am53c974.c @@ -368,6 +368,8 @@ static void dc390_check_eeprom(struct esp *esp) } esp->scsi_id = EEbuf[DC390_EE_ADAPT_SCSI_ID]; esp->num_tags = 2 << EEbuf[DC390_EE_TAG_CMD_NUM]; + if (EEbuf[DC390_EE_MODE2] & DC390_EE_MODE2_ACTIVE_NEGATION) + esp->config4 |= ESP_CONFIG4_RADE | ESP_CONFIG4_RAE; } static int pci_esp_probe_one(struct pci_dev *pdev, Reading git-diff-tree failed