Commit 1aba038b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are a number of staging, and iio, fixes for 3.13-rc5 that resolve
  some reported issues"

* tag 'staging-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()
  imx-drm: imx-drm-core: make imx_drm_crtc_register() safer
  imx-drm: imx-drm-core: use defined constant for number of CRTCs.
  imx-drm: imx-tve: don't call sleeping functions beneath enable_lock spinlock
  imx-drm: ipu-v3: fix potential CRTC device registration race
  imx-drm: imx-drm-core: fix DRM cleanup paths
  imx-drm: imx-drm-core: fix error cleanup path for imx_drm_add_crtc()
  staging: comedi: drivers: fix return value of comedi_load_firmware()
  staging: comedi: 8255_pci: fix for newer PCI-DIO48H
  iio:adc:ad7887 Fix channel reported endianness from cpu to big endian
  iio:imu:adis16400 fix pressure channel scan type
  staging:iio:mag:hmc5843 fix incorrect endianness of channel as a result of missuse of the IIO_ST macro.
  iio: cm36651: Changed return value of read function
parents 2516b615 fd6040ed

drivers/iio/adc/ad7887.c

+14 −2
Original line number Diff line number Diff line
@@ -200,7 +200,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { 
			.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),

			.address = 1,

			.scan_index = 1,

			.scan_type = IIO_ST('u', 12, 16, 0),

			.scan_type = {

				.sign = 'u',

				.realbits = 12,

				.storagebits = 16,

				.shift = 0,

				.endianness = IIO_BE,

			},

		},

		.channel[1] = {

			.type = IIO_VOLTAGE,
@@ -210,7 +216,13 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { 
			.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),

			.address = 0,

			.scan_index = 0,

			.scan_type = IIO_ST('u', 12, 16, 0),

			.scan_type = {

				.sign = 'u',

				.realbits = 12,

				.storagebits = 16,

				.shift = 0,

				.endianness = IIO_BE,

			},

		},

		.channel[2] = IIO_CHAN_SOFT_TIMESTAMP(2),

		.int_vref_mv = 2500,

drivers/iio/imu/adis16400_core.c

+6 −1
Original line number Diff line number Diff line
@@ -651,7 +651,12 @@ static const struct iio_chan_spec adis16448_channels[] = { 
		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),

		.address = ADIS16448_BARO_OUT,

		.scan_index = ADIS16400_SCAN_BARO,

		.scan_type = IIO_ST('s', 16, 16, 0),

		.scan_type = {

			.sign = 's',

			.realbits = 16,

			.storagebits = 16,

			.endianness = IIO_BE,

		},

	},

	ADIS16400_TEMP_CHAN(ADIS16448_TEMP_OUT, 12),

	IIO_CHAN_SOFT_TIMESTAMP(11)

drivers/iio/light/cm36651.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int cm36651_read_int_time(struct cm36651_data *cm36651, 
		return -EINVAL;

	}



	return IIO_VAL_INT_PLUS_MICRO;

	return IIO_VAL_INT;

}



static int cm36651_write_int_time(struct cm36651_data *cm36651,

drivers/staging/comedi/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ int comedi_load_firmware(struct comedi_device *dev, 
		release_firmware(fw);

	}



	return ret;

	return ret < 0 ? ret : 0;

}

EXPORT_SYMBOL_GPL(comedi_load_firmware);

drivers/staging/comedi/drivers/8255_pci.c

+12 −3
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ enum pci_8255_boardid { 
	BOARD_ADLINK_PCI7296,

	BOARD_CB_PCIDIO24,

	BOARD_CB_PCIDIO24H,

	BOARD_CB_PCIDIO48H,

	BOARD_CB_PCIDIO48H_OLD,

	BOARD_CB_PCIDIO48H_NEW,

	BOARD_CB_PCIDIO96H,

	BOARD_NI_PCIDIO96,

	BOARD_NI_PCIDIO96B,
@@ -106,11 +107,16 @@ static const struct pci_8255_boardinfo pci_8255_boards[] = { 
		.dio_badr	= 2,

		.n_8255		= 1,

	},

	[BOARD_CB_PCIDIO48H] = {

	[BOARD_CB_PCIDIO48H_OLD] = {

		.name		= "cb_pci-dio48h",

		.dio_badr	= 1,

		.n_8255		= 2,

	},

	[BOARD_CB_PCIDIO48H_NEW] = {

		.name		= "cb_pci-dio48h",

		.dio_badr	= 2,

		.n_8255		= 2,

	},

	[BOARD_CB_PCIDIO96H] = {

		.name		= "cb_pci-dio96h",

		.dio_badr	= 2,
@@ -263,7 +269,10 @@ static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = { 
	{ PCI_VDEVICE(ADLINK, 0x7296), BOARD_ADLINK_PCI7296 },

	{ PCI_VDEVICE(CB, 0x0028), BOARD_CB_PCIDIO24 },

	{ PCI_VDEVICE(CB, 0x0014), BOARD_CB_PCIDIO24H },

	{ PCI_VDEVICE(CB, 0x000b), BOARD_CB_PCIDIO48H },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, 0x0000, 0x0000),

	  .driver_data = BOARD_CB_PCIDIO48H_OLD },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CB, 0x000b, PCI_VENDOR_ID_CB, 0x000b),

	  .driver_data = BOARD_CB_PCIDIO48H_NEW },

	{ PCI_VDEVICE(CB, 0x0017), BOARD_CB_PCIDIO96H },

	{ PCI_VDEVICE(NI, 0x0160), BOARD_NI_PCIDIO96 },

	{ PCI_VDEVICE(NI, 0x1630), BOARD_NI_PCIDIO96B },

CRA Git | Maintained and supported by SUSTech CRA and CCSE