From c3d27fea8d66a57a678e831dfb37a1ea87aad354 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Sun, 16 Dec 2007 14:07:36 -0800 Subject: [PATCH] --- yaml --- r: 74885 b: refs/heads/master c: 497ba7f4c8113ed699a4fd793d1437f0c8f2da5e h: refs/heads/master i: 74883: fba7208eebf58710551637d21518f8ea04daebb2 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/irda-usb.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 811a05599ffc..6e23258c5c27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef5d4cf2f9aae4e09883d2d664e367a16b47d857 +refs/heads/master: 497ba7f4c8113ed699a4fd793d1437f0c8f2da5e diff --git a/trunk/drivers/net/irda/irda-usb.c b/trunk/drivers/net/irda/irda-usb.c index c6355c00fd7a..9081234ab458 100644 --- a/trunk/drivers/net/irda/irda-usb.c +++ b/trunk/drivers/net/irda/irda-usb.c @@ -1168,6 +1168,7 @@ static int stir421x_patch_device(struct irda_usb_cb *self) static int irda_usb_net_open(struct net_device *netdev) { struct irda_usb_cb *self; + unsigned long flags; char hwname[16]; int i; @@ -1177,13 +1178,16 @@ static int irda_usb_net_open(struct net_device *netdev) self = (struct irda_usb_cb *) netdev->priv; IRDA_ASSERT(self != NULL, return -1;); + spin_lock_irqsave(&self->lock, flags); /* Can only open the device if it's there */ if(!self->present) { + spin_unlock_irqrestore(&self->lock, flags); IRDA_WARNING("%s(), device not present!\n", __FUNCTION__); return -1; } if(self->needspatch) { + spin_unlock_irqrestore(&self->lock, flags); IRDA_WARNING("%s(), device needs patch\n", __FUNCTION__) ; return -EIO ; } @@ -1198,6 +1202,7 @@ static int irda_usb_net_open(struct net_device *netdev) /* To do *before* submitting Rx urbs and starting net Tx queue * Jean II */ self->netopen = 1; + spin_unlock_irqrestore(&self->lock, flags); /* * Now that everything should be initialized properly,