diff options
| author | Prasant Jalan <prasant.jalan@gmail.com> | 2017-04-01 00:40:01 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-08 17:00:51 +0200 |
| commit | 4895398d0375d57fc098c2816eb0a7dadc1c1ce6 (patch) | |
| tree | 3753947e44c02e6dfae59adfc5cc9b55aab3305f /drivers | |
| parent | d6171ba8584e01181f275f06288134c94e374b5f (diff) | |
staging: sm750fb: fixing function return with lock held
lynxfb_suspend() & lynxfb_resume() return on errors while holding
console_lock.
Adding 'goto' such that proper cleanups can be done before returning
from function and therefore console_lock can be released before
returning.
Signed-off-by: Prasant Jalan <prasant.jalan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/sm750fb/sm750.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index c618c5604cca..445c68d4f834 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -419,7 +419,7 @@ static int lynxfb_suspend(struct pci_dev *pdev, pm_message_t mesg) if (ret) { dev_err(&pdev->dev, "error:%d occurred in pci_save_state\n", ret); - return ret; + goto lynxfb_suspend_err; } ret = pci_set_power_state(pdev, pci_choose_state(pdev, mesg)); @@ -427,11 +427,13 @@ static int lynxfb_suspend(struct pci_dev *pdev, pm_message_t mesg) dev_err(&pdev->dev, "error:%d occurred in pci_set_power_state\n", ret); - return ret; + goto lynxfb_suspend_err; } } pdev->dev.power.power_state = mesg; + +lynxfb_suspend_err: console_unlock(); return ret; } @@ -456,7 +458,7 @@ static int lynxfb_resume(struct pci_dev *pdev) if (ret) { dev_err(&pdev->dev, "error:%d occurred in pci_set_power_state\n", ret); - return ret; + goto lynxfb_resume_err; } if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) { @@ -466,7 +468,7 @@ static int lynxfb_resume(struct pci_dev *pdev) dev_err(&pdev->dev, "error:%d occurred in pci_enable_device\n", ret); - return ret; + goto lynxfb_resume_err; } pci_set_master(pdev); } @@ -498,6 +500,8 @@ static int lynxfb_resume(struct pci_dev *pdev) } pdev->dev.power.power_state.event = PM_EVENT_RESUME; + +lynxfb_resume_err: console_unlock(); return ret; } |