projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
[cascardo/linux.git]
/
drivers
/
scsi
/
mvsas
/
mv_init.c
diff --git
a/drivers/scsi/mvsas/mv_init.c
b/drivers/scsi/mvsas/mv_init.c
index
e654b5c
..
e2d555c
100644
(file)
--- a/
drivers/scsi/mvsas/mv_init.c
+++ b/
drivers/scsi/mvsas/mv_init.c
@@
-334,8
+334,11
@@
int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex)
res_start = pci_resource_start(pdev, bar);
res_len = pci_resource_len(pdev, bar);
res_start = pci_resource_start(pdev, bar);
res_len = pci_resource_len(pdev, bar);
- if (!res_start || !res_len)
+ if (!res_start || !res_len) {
+ iounmap(mvi->regs_ex);
+ mvi->regs_ex = NULL;
goto err_out;
goto err_out;
+ }
res_flag = pci_resource_flags(pdev, bar);
mvi->regs = ioremap(res_start, res_len);
res_flag = pci_resource_flags(pdev, bar);
mvi->regs = ioremap(res_start, res_len);