]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
sky2: don't look for VPD size
authorStephen Hemminger <shemminger@vyatta.com>
Thu, 11 Jun 2009 07:03:47 +0000 (07:03 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 2 Jul 2009 23:49:42 +0000 (16:49 -0700)
commit51058607814a1cde627d2878866f2aee6b99e8f1
tree9622ccac0e2b3e25680414b34241e94121b8915b
parentb87864a18e91c8b78a8defee42d73610e4f6ae5b
sky2: don't look for VPD size

[ Upstream commit 6cc90a5a6061428358d0f726a53fb44af5254111 ]

The code to compute VPD size didn't handle some systems that use
chip without VPD. Also some of the newer chips use some additional
registers to store the actual size, and wasn't worth putting the
additional complexity in, so just remove the code.

No big loss since the code to set the VPD size was only a
convenience so that utilities would not read the extra space past
the end of the available VPD.

Move the first PCI config read earlier to detect bad hardware
where it returns all ones and refuse loading driver before furthur
damage.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/sky2.c