ohci1394: cleanup the "Unexpected PCI resource length" warning.
authorJody McIntyre <scjody@modernduck.com>
Wed, 29 Mar 2006 01:04:04 +0000 (20:04 -0500)
committerJody McIntyre <scjody@modernduck.com>
Wed, 29 Mar 2006 01:04:04 +0000 (20:04 -0500)
This warning happens in practice because the resource length reported by
the chipset is too large.  This is not actually a problem, so don't warn
about it.  If it happens to be too small, warn about that, but with
a different message so people who are used to ignoring the old message
don't.

Signed-off-by: Jody McIntyre <scjody@modernduck.com>
drivers/ieee1394/ohci1394.c

index 24d045c353e5828f005630820e4923cd314b66bc..a86beeb6af5d25bcc9dbe3d01dea3ca4bacfda2a 100644 (file)
@@ -3262,8 +3262,8 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
         * fail to report the right length.  Anyway, the ohci spec
         * clearly says it's 2kb, so this shouldn't be a problem. */
        ohci_base = pci_resource_start(dev, 0);
-       if (pci_resource_len(dev, 0) != OHCI1394_REGISTER_SIZE)
-               PRINT(KERN_WARNING, "Unexpected PCI resource length of %lx!",
+       if (pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE)
+               PRINT(KERN_WARNING, "PCI resource length of %lx too small!",
                      pci_resource_len(dev, 0));
 
        /* Seems PCMCIA handles this internally. Not sure why. Seems