---

yaml
---
r: 74595
b: refs/heads/master
c: 2ed3551
h: refs/heads/master
i:
  74593: 2485441
  74591: 2fb06f3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fad91c890909aabab0d9858d50f3c8394ee16b21
+refs/heads/master: 2ed355165ff4ec834a75770f2a15dc87f5e06088

trunk/drivers/spi/spi_bfin5xx.c

@@ -998,6 +998,18 @@ static int setup(struct spi_device *spi)
 
 	/* chip_info isn't always needed */
 	if (chip_info) {
+		/* Make sure people stop trying to set fields via ctl_reg
+		 * when they should actually be using common SPI framework.
+		 * Currently we let through: WOM EMISO PSSE GM SZ TIMOD.
+		 * Not sure if a user actually needs/uses any of these,
+		 * but let's assume (for now) they do.
+		 */
+		if (chip_info->ctl_reg & (SPE|MSTR|CPOL|CPHA|LSBF|SIZE)) {
+			dev_err(&spi->dev, "do not set bits in ctl_reg "
+				"that the SPI framework manages\n");
+			return -EINVAL;
+		}
+
 		chip->enable_dma = chip_info->enable_dma != 0
 		    && drv_data->master_info->enable_dma;
 		chip->ctl_reg = chip_info->ctl_reg;