diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap/linus/0041-tg3-fix-return-value-check-in-tg3_read_vpd.patch')
| -rw-r--r-- | extras/recipes-kernel/linux/linux-omap/linus/0041-tg3-fix-return-value-check-in-tg3_read_vpd.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap/linus/0041-tg3-fix-return-value-check-in-tg3_read_vpd.patch b/extras/recipes-kernel/linux/linux-omap/linus/0041-tg3-fix-return-value-check-in-tg3_read_vpd.patch new file mode 100644 index 00000000..c77fb857 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap/linus/0041-tg3-fix-return-value-check-in-tg3_read_vpd.patch @@ -0,0 +1,35 @@ +From 8742365f4de2afdd0168366b49a3118e67354a21 Mon Sep 17 00:00:00 2001 +From: David Sterba <dsterba@suse.cz> +Date: Wed, 29 Dec 2010 03:40:31 +0000 +Subject: [PATCH 41/65] tg3: fix return value check in tg3_read_vpd() + +Besides -ETIMEDOUT and -EINTR, pci_read_vpd may return other error +values like -ENODEV or -EINVAL which are ignored due to the buggy +check, but the data are not read from VPD anyway and this is checked +subsequently with at most 3 needless loop iterations. This does not +show up as a runtime bug. + +CC: Matt Carlson <mcarlson@broadcom.com> +CC: Michael Chan <mchan@broadcom.com> +Signed-off-by: David Sterba <dsterba@suse.cz> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/tg3.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c +index 30ccbb6..6f97b7b 100644 +--- a/drivers/net/tg3.c ++++ b/drivers/net/tg3.c +@@ -12658,7 +12658,7 @@ static void __devinit tg3_read_vpd(struct tg3 *tp) + cnt = pci_read_vpd(tp->pdev, pos, + TG3_NVM_VPD_LEN - pos, + &vpd_data[pos]); +- if (cnt == -ETIMEDOUT || -EINTR) ++ if (cnt == -ETIMEDOUT || cnt == -EINTR) + cnt = 0; + else if (cnt < 0) + goto out_not_found; +-- +1.6.6.1 + |