Commit 61c507cf authored by Michel von Czettritz's avatar Michel von Czettritz Committed by Greg Kroah-Hartman

staging: sm750: move assignment out of if cond

This patch moves the assignments from the if conditions to the line before the condition.
The 3 occurrence are return values and the checks for errors.
Signed-off-by: default avatarMichel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb1167a3
......@@ -477,7 +477,8 @@ static int lynxfb_resume(struct pci_dev *pdev)
console_lock();
if ((ret = pci_set_power_state(pdev, PCI_D0)) != 0) {
ret = pci_set_power_state(pdev, PCI_D0);
if (ret) {
pr_err("error:%d occured in pci_set_power_state\n", ret);
return ret;
}
......@@ -485,7 +486,8 @@ static int lynxfb_resume(struct pci_dev *pdev)
if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) {
pci_restore_state(pdev);
if ((ret = pci_enable_device(pdev)) != 0) {
ret = pci_enable_device(pdev);
if (ret) {
pr_err("error:%d occured in pci_enable_device\n", ret);
return ret;
}
......@@ -975,7 +977,8 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
info->cmap.red, info->cmap.green, info->cmap.blue,
info->cmap.transp);
if ((ret = fb_alloc_cmap(&info->cmap, 256, 0)) < 0) {
ret = fb_alloc_cmap(&info->cmap, 256, 0);
if (ret < 0) {
pr_err("Could not allcate memory for cmap.\n");
goto exit;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment