aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Rankin <rankincj@yahoo.com>2011-09-04 14:26:21 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-21 15:45:54 -0400
commit9da9f356dc73c2ae65a15a1c1d6e53142706e96b (patch)
tree3b4cf394474de51509087ecea8d9106333f9ece9
parent6e89648195eba51ae7f6de9104fdb2e0920b4aef (diff)
[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<rankincj@yahoo.com> > 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<rankincj@yahoo.com> > Signed-off-by: Mauro Carvalho Chehab<mchehab@redhat.com> > > drivers/media/video/em28xx/em28xx-cards.c | 33 ++++++++++++++--------------- I think you missed this line in the merge. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4bdf2d00dfb1..7425f92d7836 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,
3114 em28xx_err(DRIVER_NAME " This is an anciliary " 3114 em28xx_err(DRIVER_NAME " This is an anciliary "
3115 "interface not used by the driver\n"); 3115 "interface not used by the driver\n");
3116 3116
3117 em28xx_devused &= ~(1<<nr);
3118 retval = -ENODEV; 3117 retval = -ENODEV;
3119 goto err; 3118 goto err;
3120 } 3119 }