Commit 30f85882 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: bcm5974 - use guard notation when acquiring mutex

This makes the code more compact and error handling more robust
by ensuring that mutexes are released in all code paths when control
leaves critical section.
Acked-by: default avatarHenrik Rydberg <rydberg@bitmath.org>
Link: https://lore.kernel.org/r/ZsrBVO2w9WwX73iU@google.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 40a6bb10
...@@ -834,13 +834,11 @@ static int bcm5974_open(struct input_dev *input) ...@@ -834,13 +834,11 @@ static int bcm5974_open(struct input_dev *input)
if (error) if (error)
return error; return error;
mutex_lock(&dev->pm_mutex); scoped_guard(mutex, &dev->pm_mutex) {
error = bcm5974_start_traffic(dev);
error = bcm5974_start_traffic(dev); if (!error)
if (!error) dev->opened = 1;
dev->opened = 1; }
mutex_unlock(&dev->pm_mutex);
if (error) if (error)
usb_autopm_put_interface(dev->intf); usb_autopm_put_interface(dev->intf);
...@@ -852,12 +850,10 @@ static void bcm5974_close(struct input_dev *input) ...@@ -852,12 +850,10 @@ static void bcm5974_close(struct input_dev *input)
{ {
struct bcm5974 *dev = input_get_drvdata(input); struct bcm5974 *dev = input_get_drvdata(input);
mutex_lock(&dev->pm_mutex); scoped_guard(mutex, &dev->pm_mutex) {
bcm5974_pause_traffic(dev);
bcm5974_pause_traffic(dev); dev->opened = 0;
dev->opened = 0; }
mutex_unlock(&dev->pm_mutex);
usb_autopm_put_interface(dev->intf); usb_autopm_put_interface(dev->intf);
} }
...@@ -866,29 +862,24 @@ static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message) ...@@ -866,29 +862,24 @@ static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message)
{ {
struct bcm5974 *dev = usb_get_intfdata(iface); struct bcm5974 *dev = usb_get_intfdata(iface);
mutex_lock(&dev->pm_mutex); guard(mutex)(&dev->pm_mutex);
if (dev->opened) if (dev->opened)
bcm5974_pause_traffic(dev); bcm5974_pause_traffic(dev);
mutex_unlock(&dev->pm_mutex);
return 0; return 0;
} }
static int bcm5974_resume(struct usb_interface *iface) static int bcm5974_resume(struct usb_interface *iface)
{ {
struct bcm5974 *dev = usb_get_intfdata(iface); struct bcm5974 *dev = usb_get_intfdata(iface);
int error = 0;
mutex_lock(&dev->pm_mutex); guard(mutex)(&dev->pm_mutex);
if (dev->opened) if (dev->opened)
error = bcm5974_start_traffic(dev); return bcm5974_start_traffic(dev);
mutex_unlock(&dev->pm_mutex); return 0;
return error;
} }
static int bcm5974_probe(struct usb_interface *iface, static int bcm5974_probe(struct usb_interface *iface,
......
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