diff options
| author |   Koen Kooi <koen@openembedded.org> | 2011-01-12 17:01:42 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2011-01-12 19:27:34 +0100 |
| commit | 6e749b6713943cae1031178179df4f42e59aa912 (patch) | |
| tree | 609f08846f31634791d314c5c190bd70ef7b408c /recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch | |
| parent | 163019f7508b0c7b1f77c37845b84dee748d7d9d (diff) | |
| download | openembedded-6e749b6713943cae1031178179df4f42e59aa912.tar.gz | |
linux-omap: move to 2.6.37 final
There is no 2.6.37-omap1 tag and linus' tree is missing fixes, so patch up -rc8 with the patches from mainline
Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch')
| -rw-r--r-- | recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch b/recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch new file mode 100644 index 0000000000..55b887a78f --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37/linus/0016-skfp-testing-the-wrong-variable-in-skfp_driver_init.patch @@ -0,0 +1,31 @@ +From 4a5fc4e179d79c79ad87bfc12a2d7e9b2371e40c Mon Sep 17 00:00:00 2001 +From: Dan Carpenter <error27@gmail.com> +Date: Thu, 23 Dec 2010 19:17:34 +0000 +Subject: [PATCH 16/66] skfp: testing the wrong variable in skfp_driver_init() + +The intent here was to test if the allocation failed but we tested +"SharedMemSize" instead of "SharedMemAddr" by mistake. + +Signed-off-by: Dan Carpenter <error27@gmail.com> +Reviewed-by: Jiri Pirko <jpirko@redhat.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/skfp/skfddi.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c +index 0a66fed..16c6265 100644 +--- a/drivers/net/skfp/skfddi.c ++++ b/drivers/net/skfp/skfddi.c +@@ -412,7 +412,7 @@ static int skfp_driver_init(struct net_device *dev) + bp->SharedMemAddr = pci_alloc_consistent(&bp->pdev, + bp->SharedMemSize, + &bp->SharedMemDMA); +- if (!bp->SharedMemSize) { ++ if (!bp->SharedMemAddr) { + printk("could not allocate mem for "); + printk("hardware module: %ld byte\n", + bp->SharedMemSize); +-- +1.6.6.1 + |