Author: gonzo
Date: Mon Feb  4 10:20:48 2019
New Revision: 343738
URL: https://svnweb.freebsd.org/changeset/base/343738

Log:
  MFC r343170:
  
  [aic7xxx] Use correct product name 29320LPE instead of non-existent 39320LPE
  
  The PCI id belongs to Adaptec 29320LPE controller. The same fix also was
  merged[1] to OpenBSD driver ~6 years ago.
  
  [1] https://github.com/openbsd/src/commit/f997b5
  
  PR:           172133
  Submitted by: henning.peter...@t-online.de

Modified:
  stable/12/sys/dev/aic7xxx/aic79xx_pci.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/aic7xxx/aic79xx_pci.c
==============================================================================
--- stable/12/sys/dev/aic7xxx/aic79xx_pci.c     Mon Feb  4 10:19:27 2019        
(r343737)
+++ stable/12/sys/dev/aic7xxx/aic79xx_pci.c     Mon Feb  4 10:20:48 2019        
(r343738)
@@ -75,6 +75,7 @@ ahd_compose_id(u_int device, u_int vendor, u_int subde
 #define ID_AIC7901                     0x800F9005FFFF9005ull
 #define ID_AHA_29320A                  0x8000900500609005ull
 #define ID_AHA_29320ALP                        0x8017900500449005ull
+#define ID_AHA_29320LPE                0x8017900500459005ull
 
 #define ID_AIC7901A                    0x801E9005FFFF9005ull
 #define ID_AHA_29320LP                 0x8014900500449005ull
@@ -91,7 +92,6 @@ ahd_compose_id(u_int device, u_int vendor, u_int subde
 #define ID_AHA_39320D_B                        0x801C900500419005ull
 #define ID_AHA_39320D_HP               0x8011900500AC0E11ull
 #define ID_AHA_39320D_B_HP             0x801C900500AC0E11ull
-#define ID_AHA_39320LPE                0x8017900500459005ull
 #define ID_AIC7902_PCI_REV_A4          0x3
 #define ID_AIC7902_PCI_REV_B0          0x10
 #define SUBID_HP                       0x0E11
@@ -144,6 +144,12 @@ struct ahd_pci_identity ahd_pci_ident_table [] =
                "Adaptec 29320ALP Ultra320 SCSI adapter",
                ahd_aic7901_setup
        },
+       {
+               ID_AHA_29320LPE,
+               ID_ALL_MASK,
+               "Adaptec 29320LPE Ultra320 SCSI adapter",
+               ahd_aic7901_setup
+       },
        /* aic7901A based controllers */
        {
                ID_AHA_29320LP,
@@ -210,12 +216,6 @@ struct ahd_pci_identity ahd_pci_ident_table [] =
                ID_AHA_39320D_B_HP,
                ID_ALL_MASK,
                "Adaptec (HP OEM) 39320D Ultra320 SCSI adapter",
-               ahd_aic7902_setup
-       },
-       {
-               ID_AHA_39320LPE,
-               ID_ALL_MASK,
-               "Adaptec 39320LPE Ultra320 SCSI adapter",
                ahd_aic7902_setup
        },
        /* Generic chip probes for devices we don't know 'exactly' */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to