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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: vme: Re-introduce necessary brackets
  Staging: iio: fix up the iio_get_new_idr_val comment
  Staging: add Add Sitecom WL-349 to rtl8192su
  Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id
  staging: rtl8192su: add Support for Belkin F5D8053 v6
  Staging: dt3155: fix 50Hz configuration
  staging: usbip: Fix deadlock
  Staging: rtl8192su: add USB ID for 0bda:8171
  Staging: hv: name network device ethX rather than sethX
  Staging: hv: Fix up memory leak on HvCleanup
  Staging: hv: Fix a bug affecting IPv6
  staging: iio: ring_sw: Fix incorrect test on successful read of last value, causes infinite loop
  staging: iio: Function iio_get_new_idr_val() return negative value if fails.
  Staging: iio: adc: fix dangling pointers
  Staging: iio: light: fix dangling pointers
  Staging: iio: test for failed allocation
  staging: iio: lis3l02dq - incorrect ws used in container of call.
parents 87156d69 4839737b

drivers/staging/dt3155/dt3155_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -464,9 +464,9 @@ static void dt3155_init_isr(int minor) 
  /* 50/60 Hz should be set before this point but let's make sure it is */

  /* right anyway */



  ReadI2C(dt3155_lbase[ minor ], CONFIG, &i2c_csr2.reg);

  ReadI2C(dt3155_lbase[ minor ], CSR2, &i2c_csr2.reg);

  i2c_csr2.fld.HZ50 = FORMAT50HZ;

  WriteI2C(dt3155_lbase[ minor ], CONFIG, i2c_config.reg);

  WriteI2C(dt3155_lbase[ minor ], CSR2, i2c_csr2.reg);



  /* enable busmaster chip, clear flags */

drivers/staging/hv/Hv.c

+1 −1
Original line number Diff line number Diff line
@@ -306,9 +306,9 @@ void HvCleanup(void) 
	DPRINT_ENTER(VMBUS);



	if (gHvContext.SignalEventBuffer) {

		kfree(gHvContext.SignalEventBuffer);

		gHvContext.SignalEventBuffer = NULL;

		gHvContext.SignalEventParam = NULL;

		kfree(gHvContext.SignalEventBuffer);

	}



	if (gHvContext.HypercallPage) {

drivers/staging/hv/RndisFilter.c

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ static int RndisFilterOpenDevice(struct rndis_device *Device) 


	ret = RndisFilterSetPacketFilter(Device,

					 NDIS_PACKET_TYPE_BROADCAST |

					 NDIS_PACKET_TYPE_ALL_MULTICAST |

					 NDIS_PACKET_TYPE_DIRECTED);

	if (ret == 0)

		Device->State = RNDIS_DEV_DATAINITIALIZED;

drivers/staging/hv/netvsc_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -403,8 +403,7 @@ static int netvsc_probe(struct device *device) 
	if (!net_drv_obj->Base.OnDeviceAdd)

		return -1;



	net = alloc_netdev(sizeof(struct net_device_context), "seth%d",

			   ether_setup);

	net = alloc_etherdev(sizeof(struct net_device_context));

	if (!net)

		return -1;

drivers/staging/iio/accel/lis3l02dq_core.c

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ static int lis3l02dq_thresh_handler_th(struct iio_dev *dev_info, 
static void lis3l02dq_thresh_handler_bh_no_check(struct work_struct *work_s)

{

	struct iio_work_cont *wc

		= container_of(work_s, struct iio_work_cont, ws_nocheck);

		= container_of(work_s, struct iio_work_cont, ws);

	struct lis3l02dq_state *st = wc->st;

	u8 t;