diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-13 18:56:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-13 18:56:22 -0400 |
| commit | e8444a3e3b56b268c6ca31a2f77040fd944834fb (patch) | |
| tree | e35fea64da327096ae7fa60a76eed22da2b2f500 /drivers/mtd/maps/amd76xrom.c | |
| parent | 95a17a23a2189512bc76e7a5901521129d7ae9c1 (diff) | |
| parent | c804c733846572ca85c2bba60c7fe6fa024dff18 (diff) | |
Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38
* git://git.infradead.org/users/dwmw2/mtd-2.6.38:
mtd: add "platform:" prefix for platform modalias
mtd: mtd_blkdevs: fix double free on error path
mtd: amd76xrom: fix oops at boot when resources are not available
mtd: fix race in cfi_cmdset_0001 driver
mtd: jedec_probe: initialise make sector erase command variable
mtd: jedec_probe: Change variable name from cfi_p to cfi
Diffstat (limited to 'drivers/mtd/maps/amd76xrom.c')
| -rw-r--r-- | drivers/mtd/maps/amd76xrom.c | 1 |
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, | |||
| 151 | printk(KERN_ERR MOD_NAME | 151 | printk(KERN_ERR MOD_NAME |
| 152 | " %s(): Unable to register resource %pR - kernel bug?\n", | 152 | " %s(): Unable to register resource %pR - kernel bug?\n", |
| 153 | __func__, &window->rsrc); | 153 | __func__, &window->rsrc); |
| 154 | return -EBUSY; | ||
| 154 | } | 155 | } |
| 155 | 156 | ||
| 156 | 157 | ||