diff options
author | David Woodhouse <dwmw2@infradead.org> | 2010-11-01 06:35:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-08 15:17:05 -0500 |
commit | 3ce1227c3c374c742ed78484226e24567f09ff99 (patch) | |
tree | 0b3328b7dc057b49f32ac32f64f7694eb79426d9 | |
parent | 1a4ec46a68292515ae84deb8ee5cc2572db1fa99 (diff) |
solos: Refuse to upgrade firmware with older FPGA. It doesn't work.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/atm/solos-pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index f46138ab38b6..2e08c996fd30 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c | |||
@@ -1161,6 +1161,14 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
1161 | dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n", | 1161 | dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n", |
1162 | major_ver, minor_ver, fpga_ver); | 1162 | major_ver, minor_ver, fpga_ver); |
1163 | 1163 | ||
1164 | if (fpga_ver < 37 && (fpga_upgrade || firmware_upgrade || | ||
1165 | db_fpga_upgrade || db_firmware_upgrade)) { | ||
1166 | dev_warn(&dev->dev, | ||
1167 | "FPGA too old; cannot upgrade flash. Use JTAG.\n"); | ||
1168 | fpga_upgrade = firmware_upgrade = 0; | ||
1169 | db_fpga_upgrade = db_firmware_upgrade = 0; | ||
1170 | } | ||
1171 | |||
1164 | if (card->fpga_version >= DMA_SUPPORTED){ | 1172 | if (card->fpga_version >= DMA_SUPPORTED){ |
1165 | card->using_dma = 1; | 1173 | card->using_dma = 1; |
1166 | } else { | 1174 | } else { |