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

Commit abad21a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver bugfixes from Greg Kroah-Hartman:
 "Here are some bugfixes for the drivers/staging tree for 3.8-rc4.

  Nothing major, just a number of small fixes for problems that people
  have reported, including finally tracking down the root of the 64/32
  bit problem with the vt6656 that has been driving people crazy for a
  while"

* tag 'staging-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging/sb105x: PARPORT config is not good enough must use PARPORT_PC
  staging: wlan-ng: Fix clamping of returned SSID length
  staging: vt6656: Fix inconsistent structure packing
  staging:iio:adis16080: Perform sign extension
  iio: mxs-lradc: indexes are unsigned
parents 0d060d28 7dfc8331

drivers/staging/iio/adc/mxs-lradc.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p) 
	struct mxs_lradc *lradc = iio_priv(iio);

	const uint32_t chan_value = LRADC_CH_ACCUMULATE |

		((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);

	int i, j = 0;

	unsigned int i, j = 0;



	for_each_set_bit(i, iio->active_scan_mask, iio->masklength) {

		lradc->buffer[j] = readl(lradc->base + LRADC_CH(j));

drivers/staging/iio/gyro/adis16080_core.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int adis16080_spi_read(struct iio_dev *indio_dev, 
	ret = spi_read(st->us, st->buf, 2);



	if (ret == 0)

		*val = ((st->buf[0] & 0xF) << 8) | st->buf[1];

		*val = sign_extend32(((st->buf[0] & 0xF) << 8) | st->buf[1], 11);

	mutex_unlock(&st->buf_lock);



	return ret;

drivers/staging/sb105x/sb_pci_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -3054,7 +3054,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd) 
				sbdev->nr_ports = ((portnum_hex/16)*10) + (portnum_hex % 16);

			}

			break;

#ifdef CONFIG_PARPORT

#ifdef CONFIG_PARPORT_PC

		case PCI_DEVICE_ID_MP2S1P :

			sbdev->nr_ports = 2;

drivers/staging/vt6656/bssdb.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ typedef struct tagSRSNCapObject { 
} SRSNCapObject, *PSRSNCapObject;



// BSS info(AP)

#pragma pack(1)

typedef struct tagKnownBSS {

    // BSS info

    BOOL            bActive;

drivers/staging/vt6656/int.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "device.h"



/*---------------------  Export Definitions -------------------------*/

#pragma pack(1)

typedef struct tagSINTData {

	BYTE byTSR0;

	BYTE byPkt0;