mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
sgiioc4: fix error cleanup path (take 2)
The driver "forgot" to call iounmap() iff request_mem_region() call failed in sgiioc4_ide_setup_pci_device()... Signed-off-by: Sergei Shtylyov <[email protected]> Cc: [email protected] Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
This commit is contained in:
parent
d2441183dc
commit
3059ef99a1
1 changed files with 3 additions and 1 deletions
|
|
@ -590,7 +590,8 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
|
|||
printk(KERN_ERR "%s %s -- ERROR: addresses 0x%08lx to 0x%08lx "
|
||||
"already in use\n", DRV_NAME, pci_name(dev),
|
||||
cmd_phys_base, cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
|
||||
return -EBUSY;
|
||||
rc = -EBUSY;
|
||||
goto req_mem_rgn_err;
|
||||
}
|
||||
|
||||
/* Initialize the IO registers */
|
||||
|
|
@ -618,6 +619,7 @@ err_free:
|
|||
ide_host_free(host);
|
||||
err:
|
||||
release_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE);
|
||||
req_mem_rgn_err:
|
||||
iounmap(virt_base);
|
||||
return rc;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue