Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac7c98ec authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

[IRDA] donauboe: locking fix 



From: Andrew Morton <akpm@osdl.org>

Two missing unlocks, as noted by Ted Unangst <tedu@coverity.com>

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3f9b92a

drivers/net/irda/donauboe.c

+9 −5
Original line number Diff line number Diff line
@@ -1459,8 +1459,10 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
       */

      IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __FUNCTION__

          ,dev->name, INB (OBOE_STATUS), irq->ifr_baudrate );

      if (!in_interrupt () && !capable (CAP_NET_ADMIN))

        return -EPERM;

      if (!in_interrupt () && !capable (CAP_NET_ADMIN)) {

	ret = -EPERM;

	goto out;

      }



      /* self->speed=irq->ifr_baudrate; */

      /* toshoboe_setbaud(self); */
@@ -1470,8 +1472,10 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
    case SIOCSMEDIABUSY:       /* Set media busy */

      IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __FUNCTION__

          ,dev->name, INB (OBOE_STATUS), capable (CAP_NET_ADMIN) );

      if (!capable (CAP_NET_ADMIN))

        return -EPERM;

      if (!capable (CAP_NET_ADMIN)) {

	ret = -EPERM;

	goto out;

      }

      irda_device_set_media_busy (self->netdev, TRUE);

      break;

    case SIOCGRECEIVING:       /* Check if we are receiving right now */
@@ -1483,7 +1487,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
      IRDA_DEBUG (1, "%s(?), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);

      ret = -EOPNOTSUPP;

    }



out:

  spin_unlock_irqrestore(&self->spinlock, flags);

  return ret;