From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Dec 2017 08:12:51 +0000 (+0100)
Subject: Merge 4.15-rc4 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7f9d04bc568d22e573a10e2a0a316599942786f7;p=linux.git

Merge 4.15-rc4 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

7f9d04bc568d22e573a10e2a0a316599942786f7
diff --cc drivers/staging/pi433/rf69.c
index f77ecd60f43ab,12c9df9cddde2..3675dc03a7d33
--- a/drivers/staging/pi433/rf69.c
+++ b/drivers/staging/pi433/rf69.c
@@@ -100,12 -96,16 +100,12 @@@ enum modulation rf69_get_modulation(str
  {
  	u8 currentValue;
  
 -	#ifdef DEBUG
 -		dev_dbg(&spi->dev, "get: mode");
 -	#endif
 -
 -	currentValue = READ_REG(REG_DATAMODUL);
 +	currentValue = rf69_read_reg(spi, REG_DATAMODUL);
  
- 	switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE >> 3) { // TODO improvement: change 3 to define
+ 	switch (currentValue & MASK_DATAMODUL_MODULATION_TYPE) {
  	case DATAMODUL_MODULATION_TYPE_OOK: return OOK;
  	case DATAMODUL_MODULATION_TYPE_FSK: return FSK;
 -	default:			    return undefined;
 +	default:			    return UNDEF;
  	}
  }