diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 11:07:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 11:07:22 -0800 |
| commit | aa5e75bc7a7c4ecbdee7bc85d1a306041b926e24 (patch) | |
| tree | 23c7f2c2a1b500cb209b5b4c25fcdeb43e07305e | |
| parent | bc4e118355caf83f472a5d31b850e73adddcf0ab (diff) | |
| parent | 2023b0524a6310e9ea80daf085f51c71bff9289f (diff) | |
Merge tag 'for-backlight-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Fix-ups:
- Deprecate pci_get_bus_and_slot() in apple_bl
Bug Fixes:
- Enable Chip Select when conducting SPI transfers in corgi_lcd,
tdo24m, tosa_lcd"
* tag 'for-backlight-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: tdo24m: Fix the SPI CS between transfers
backlight: apple_bl: Deprecate pci_get_bus_and_slot()
| -rw-r--r-- | drivers/video/backlight/apple_bl.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/corgi_lcd.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/tdo24m.c | 2 | ||||
| -rw-r--r-- | drivers/video/backlight/tosa_lcd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c index d84329676689..6a34ab936726 100644 --- a/drivers/video/backlight/apple_bl.c +++ b/drivers/video/backlight/apple_bl.c @@ -143,7 +143,7 @@ static int apple_bl_add(struct acpi_device *dev) struct pci_dev *host; int intensity; - host = pci_get_bus_and_slot(0, 0); + host = pci_get_domain_bus_and_slot(0, 0, 0); if (!host) { pr_err("unable to find PCI host\n"); diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c index d7c239ea3d09..f5574060f9c8 100644 --- a/drivers/video/backlight/corgi_lcd.c +++ b/drivers/video/backlight/corgi_lcd.c @@ -177,7 +177,7 @@ static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int adrs, uint8_t data) struct spi_message msg; struct spi_transfer xfer = { .len = 1, - .cs_change = 1, + .cs_change = 0, .tx_buf = lcd->buf, }; diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c index eab1f842f9c0..e4bd63e9db6b 100644 --- a/drivers/video/backlight/tdo24m.c +++ b/drivers/video/backlight/tdo24m.c @@ -369,7 +369,7 @@ static int tdo24m_probe(struct spi_device *spi) spi_message_init(m); - x->cs_change = 1; + x->cs_change = 0; x->tx_buf = &lcd->buf[0]; spi_message_add_tail(x, m); diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c index 6a41ea92737a..4dc5ee8debeb 100644 --- a/drivers/video/backlight/tosa_lcd.c +++ b/drivers/video/backlight/tosa_lcd.c @@ -49,7 +49,7 @@ static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data) struct spi_message msg; struct spi_transfer xfer = { .len = 1, - .cs_change = 1, + .cs_change = 0, .tx_buf = buf, }; |