From: Chris Rankin Date: Sun, 4 Sep 2011 18:26:21 +0000 (-0300) Subject: [media] em28xx: Fix em28xx_devused cleanup logic on error X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9da9f356dc73c2ae65a15a1c1d6e53142706e96b;p=mv-sheeva.git [media] em28xx: Fix em28xx_devused cleanup logic on error On 04/09/11 00:49, Mauro Carvalho Chehab wrote: > This is an automatic generated email to let you know that the following patch were queued at the > http://git.linuxtv.org/media_tree.git tree: > > Subject: [media] em28xx: use atomic bit operations for devices-in-use mask > Author: Chris Rankin > Date: Sat Aug 20 08:21:03 2011 -0300 > > Use atomic bit operations for the em28xx_devused mask, to prevent an > unlikely race condition should two adapters be plugged in > simultaneously. The operations also clearer than explicit bit > manipulation anyway. > > Signed-off-by: Chris Rankin > Signed-off-by: Mauro Carvalho Chehab > > drivers/media/video/em28xx/em28xx-cards.c | 33 ++++++++++++++--------------- I think you missed this line in the merge. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 4bdf2d00dfb..7425f92d783 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -3114,7 +3114,6 @@ static int em28xx_usb_probe(struct usb_interface *interface, em28xx_err(DRIVER_NAME " This is an anciliary " "interface not used by the driver\n"); - em28xx_devused &= ~(1<