Commit 2fd79d9b authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley

[PATCH] sym53c8xx 2.1.18b

This patch fixes two bugs in sym 2.1.18.

 - 40-bit addressing doesn't fit into 32-bits, so PciDmaMask needs
   to be an ULL.
 - Add terminating entries to pci_device_id tables.  Bug spotted by
   Matt Domsch.
parent 5a44e1e3
...@@ -1617,7 +1617,7 @@ static int sym_setup_bus_dma_mask(struct sym_hcb *np) ...@@ -1617,7 +1617,7 @@ static int sym_setup_bus_dma_mask(struct sym_hcb *np)
goto out_err32; goto out_err32;
#else #else
#if SYM_CONF_DMA_ADDRESSING_MODE == 1 #if SYM_CONF_DMA_ADDRESSING_MODE == 1
#define PciDmaMask 0xffffffffff #define PciDmaMask 0xffffffffffULL
#elif SYM_CONF_DMA_ADDRESSING_MODE == 2 #elif SYM_CONF_DMA_ADDRESSING_MODE == 2
#define PciDmaMask 0xffffffffffffffffULL #define PciDmaMask 0xffffffffffffffffULL
#endif #endif
...@@ -2316,6 +2316,7 @@ static void pqs_remove() ...@@ -2316,6 +2316,7 @@ static void pqs_remove()
static struct pci_device_id pqs_id_table[] __devinitdata = { static struct pci_device_id pqs_id_table[] __devinitdata = {
{ 0x101a, 0x0009, }, { 0x101a, 0x0009, },
{ 0, }
}; };
MODULE_DEVICE_TABLE(pci, pqs_id_table); MODULE_DEVICE_TABLE(pci, pqs_id_table);
...@@ -2411,6 +2412,7 @@ static struct pci_device_id sym2_id_table[] __devinitdata = { ...@@ -2411,6 +2412,7 @@ static struct pci_device_id sym2_id_table[] __devinitdata = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875J, { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875J,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ 0, }
}; };
MODULE_DEVICE_TABLE(pci, sym2_id_table); MODULE_DEVICE_TABLE(pci, sym2_id_table);
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#define SYM_DRIVER_NAME "sym-2.1.18" #define SYM_DRIVER_NAME "sym-2.1.18b"
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <dev/sym/sym_glue.h> #include <dev/sym/sym_glue.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment