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

Commit 7d450e00 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents 95d161cb b312d799

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ static void handle_irq_noise(struct bcm43xx_private *bcm) 
		goto generate_new;



	/* Get the noise samples. */

	assert(bcm->noisecalc.nr_samples <= 8);

	assert(bcm->noisecalc.nr_samples < 8);

	i = bcm->noisecalc.nr_samples;

	noise[0] = limit_value(noise[0], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);

	noise[1] = limit_value(noise[1], 0, ARRAY_SIZE(radio->nrssi_lt) - 1);

drivers/net/wireless/zd1211rw/zd_usb.c

+3 −9
Original line number Diff line number Diff line
@@ -375,10 +375,8 @@ static void int_urb_complete(struct urb *urb, struct pt_regs *pt_regs) 
	case -ENODEV:

	case -ENOENT:

	case -ECONNRESET:

		goto kfree;

	case -EPIPE:

		usb_clear_halt(urb->dev, EP_INT_IN);

		/* FALL-THROUGH */

		goto kfree;

	default:

		goto resubmit;

	}
@@ -580,10 +578,8 @@ static void rx_urb_complete(struct urb *urb, struct pt_regs *pt_regs) 
	case -ENODEV:

	case -ENOENT:

	case -ECONNRESET:

		return;

	case -EPIPE:

		usb_clear_halt(urb->dev, EP_DATA_IN);

		/* FALL-THROUGH */

		return;

	default:

		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);

		goto resubmit;
@@ -749,11 +745,9 @@ static void tx_urb_complete(struct urb *urb, struct pt_regs *pt_regs) 
	case -ENODEV:

	case -ENOENT:

	case -ECONNRESET:

	case -EPIPE:

		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);

		break;

	case -EPIPE:

		usb_clear_halt(urb->dev, EP_DATA_OUT);

		/* FALL-THROUGH */

	default:

		dev_dbg_f(urb_dev(urb), "urb %p error %d\n", urb, urb->status);

		goto resubmit;