Date: Thu, 25 Jul 2013 09:30:00 +0000 (UTC) From: Ulrich Spoerlein <uqs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253646 - head/sys/dev/aic7xxx Message-ID: <201307250930.r6P9U00t058451@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: uqs Date: Thu Jul 25 09:30:00 2013 New Revision: 253646 URL: http://svnweb.freebsd.org/changeset/base/253646 Log: Match function definition to declaration and call-site. SVN r95378 refactored ahc_9005_subdevinfo_valid out into a separate function but swapped the vendor/subvendor and device/subdevice pairs of the parameters. Found by: Coverity Prevent, CID 744931 Reviewed by: gibbs Modified: head/sys/dev/aic7xxx/aic7xxx_pci.c Modified: head/sys/dev/aic7xxx/aic7xxx_pci.c ============================================================================== --- head/sys/dev/aic7xxx/aic7xxx_pci.c Thu Jul 25 09:29:48 2013 (r253645) +++ head/sys/dev/aic7xxx/aic7xxx_pci.c Thu Jul 25 09:30:00 2013 (r253646) @@ -673,8 +673,8 @@ const u_int ahc_num_pci_devs = NUM_ELEME #define STA 0x08 #define DPR 0x01 -static int ahc_9005_subdevinfo_valid(uint16_t vendor, uint16_t device, - uint16_t subvendor, uint16_t subdevice); +static int ahc_9005_subdevinfo_valid(uint16_t device, uint16_t vendor, + uint16_t subdevice, uint16_t subvendor); static int ahc_ext_scbram_present(struct ahc_softc *ahc); static void ahc_scbram_config(struct ahc_softc *ahc, int enable, int pcheck, int fast, int large); @@ -766,7 +766,7 @@ ahc_find_pci_device(aic_dev_softc_t pci) * ID as valid. */ if (aic_get_pci_function(pci) > 0 - && ahc_9005_subdevinfo_valid(vendor, device, subvendor, subdevice) + && ahc_9005_subdevinfo_valid(device, vendor, subdevice, subvendor) && SUBID_9005_MFUNCENB(subdevice) == 0) return (NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307250930.r6P9U00t058451>