提交 3059ef99 编写于 作者: S Sergei Shtylyov 提交者: Bartlomiej Zolnierkiewicz

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: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: jeremy@sgi.com
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
上级 d2441183
......@@ -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 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册