summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStanislaw Gruszka <stf_xl@wp.pl>2011-01-08 15:24:37 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-03-11 15:19:09 +0100
commit82013d988fc03a1b908b2b0360a1e34f6152fda6 (patch)
tree4fa9c93ef0846848576f115baa5bf5c95728e9a4 /drivers
parentmtd: fix race in cfi_cmdset_0001 driver (diff)
downloadlinux-82013d988fc03a1b908b2b0360a1e34f6152fda6.tar.xz
linux-82013d988fc03a1b908b2b0360a1e34f6152fda6.zip
mtd: amd76xrom: fix oops at boot when resources are not available
For some unknown reasons resources needed by amd76xrom driver can be unavailable. And instead of returning an error, the driver keeps going and crash the kernel. This patch fixes the problem by making the driver return -EBUSY if the resources are not available. Commit messages tweaked by Artem. Reported-by: Russell Whitaker <russ@ashlandhome.net> Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Cc: stable@kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/maps/amd76xrom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 77d64ce19e9f..92de7e3a49a5 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -151,6 +151,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource %pR - kernel bug?\n",
__func__, &window->rsrc);
+ return -EBUSY;
}