From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Wed, 16 Nov 2016 18:42:27 +0000 (-0200)
Subject: Merge tag 'v4.9-rc5' into patchwork
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=36f94a5cf0f9afb527f18166ae56bd3cc7204f63;p=linux-beck.git

Merge tag 'v4.9-rc5' into patchwork

Linux 4.9-rc5

* tag 'v4.9-rc5': (1102 commits)
  Linux 4.9-rc5
  gp8psk: Fix DVB frontend attach
  gp8psk: fix gp8psk_usb_in_op() logic
  dvb-usb: move data_mutex to struct dvb_usb_device
  iio: maxim_thermocouple: detect invalid storage size in read()
  aoe: fix crash in page count manipulation
  lightnvm: invalid offset calculation for lba_shift
  Kbuild: enable -Wmaybe-uninitialized warnings by default
  pcmcia: fix return value of soc_pcmcia_regulator_set
  infiniband: shut up a maybe-uninitialized warning
  crypto: aesni: shut up -Wmaybe-uninitialized warning
  rc: print correct variable for z8f0811
  dib0700: fix nec repeat handling
  s390: pci: don't print uninitialized data for debugging
  nios2: fix timer initcall return value
  x86: apm: avoid uninitialized data
  NFSv4.1: work around -Wmaybe-uninitialized warning
  Kbuild: enable -Wmaybe-uninitialized warning for "make W=1"
  lib/stackdepot: export save/fetch stack for drivers
  mm: kmemleak: scan .data.ro_after_init
  ...
---

36f94a5cf0f9afb527f18166ae56bd3cc7204f63
diff --cc drivers/media/usb/dvb-usb/cinergyT2-core.c
index 1a198d07e30e,290275bc7fde..6404205560eb
--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
@@@ -93,9 -93,10 +92,9 @@@ static int cinergyt2_frontend_attach(st
  
  	ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0);
  	if (ret < 0) {
 -		deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
 -			"state info\n");
 +		deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n");
  	}
- 	mutex_unlock(&st->data_mutex);
+ 	mutex_unlock(&d->data_mutex);
  
  	/* Copy this pointer as we are gonna need it in the release phase */
  	cinergyt2_usb_device = adap->dev;