github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 20:14:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

[media] radio-shark*: Call cancel_work_sync from disconnect rather then release

Browse Source 
This removes the need for shark_led_work to take the v4l2 lock.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans de Goede 2012-08-11 06:34:53 -03:00 committed by Mauro Carvalho Chehab
parent 820ddfa6ca
commit cfc1b2a06f
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/radio/radio-shark.c
View File

@ -181,14 +181,6 @@ static void shark_led_work(struct work_struct *work)
container_of(work, struct shark_device, led_work); container_of(work, struct shark_device, led_work);
int i, res, brightness, actual_len; int i, res, brightness, actual_len;
/*
* We use the v4l2_dev lock and registered bit to ensure the device
* does not get unplugged and unreffed while we're running.
*/
mutex_lock(&shark->tea.mutex);
if (!video_is_registered(&shark->tea.vd))
goto leave;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (!test_and_clear_bit(i, &shark->brightness_new)) if (!test_and_clear_bit(i, &shark->brightness_new))
continue; continue;
@ -208,8 +200,6 @@ static void shark_led_work(struct work_struct *work)
v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n", v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
shark->led_names[i], res); shark->led_names[i], res);
} }
leave:
mutex_unlock(&shark->tea.mutex);
} }
static void shark_led_set_blue(struct led_classdev *led_cdev, static void shark_led_set_blue(struct led_classdev *led_cdev,
@ -259,6 +249,8 @@ static void usb_shark_disconnect(struct usb_interface *intf)
for (i = 0; i < NO_LEDS; i++) for (i = 0; i < NO_LEDS; i++)
led_classdev_unregister(&shark->leds[i]); led_classdev_unregister(&shark->leds[i]);
cancel_work_sync(&shark->led_work);
v4l2_device_put(&shark->v4l2_dev); v4l2_device_put(&shark->v4l2_dev);
} }
@ -266,7 +258,6 @@ static void usb_shark_release(struct v4l2_device *v4l2_dev)
{ {
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev); struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
cancel_work_sync(&shark->led_work);
v4l2_device_unregister(&shark->v4l2_dev); v4l2_device_unregister(&shark->v4l2_dev);
kfree(shark->transfer_buffer); kfree(shark->transfer_buffer);
kfree(shark); kfree(shark);

12
drivers/media/radio/radio-shark2.c
View File

@ -166,13 +166,6 @@ static void shark_led_work(struct work_struct *work)
struct shark_device *shark = struct shark_device *shark =
container_of(work, struct shark_device, led_work); container_of(work, struct shark_device, led_work);
int i, res, brightness, actual_len; int i, res, brightness, actual_len;
/*
* We use the v4l2_dev lock and registered bit to ensure the device
* does not get unplugged and unreffed while we're running.
*/
mutex_lock(&shark->tea.mutex);
if (!video_is_registered(&shark->tea.vd))
goto leave;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (!test_and_clear_bit(i, &shark->brightness_new)) if (!test_and_clear_bit(i, &shark->brightness_new))
@ -191,8 +184,6 @@ static void shark_led_work(struct work_struct *work)
v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n", v4l2_err(&shark->v4l2_dev, "set LED %s error: %d\n",
shark->led_names[i], res); shark->led_names[i], res);
} }
leave:
mutex_unlock(&shark->tea.mutex);
} }
static void shark_led_set_blue(struct led_classdev *led_cdev, static void shark_led_set_blue(struct led_classdev *led_cdev,
@ -231,6 +222,8 @@ static void usb_shark_disconnect(struct usb_interface *intf)
for (i = 0; i < NO_LEDS; i++) for (i = 0; i < NO_LEDS; i++)
led_classdev_unregister(&shark->leds[i]); led_classdev_unregister(&shark->leds[i]);
cancel_work_sync(&shark->led_work);
v4l2_device_put(&shark->v4l2_dev); v4l2_device_put(&shark->v4l2_dev);
} }
@ -238,7 +231,6 @@ static void usb_shark_release(struct v4l2_device *v4l2_dev)
{ {
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev); struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
cancel_work_sync(&shark->led_work);
v4l2_device_unregister(&shark->v4l2_dev); v4l2_device_unregister(&shark->v4l2_dev);
kfree(shark->transfer_buffer); kfree(shark->transfer_buffer);
kfree(shark); kfree(shark);