Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32

Authored by Linus Torvalds
2 parents 73dc61cb38 41c9e95d64
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging tree fixes from Greg KH:
 "Here are two tiny staging tree fixes.  One for the nvec driver to
  resolve a reported problem, and one to add a MAINTAINERS entry for the
  Android drivers"

* tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: add Android driver entries
  staging: nvec: specify a platform-device base id

Showing 2 changed files Side-by-side Diff

... ... @@ -708,6 +708,16 @@
708 708 F: drivers/staging/iio/*/ad*
709 709 F: staging/iio/trigger/iio-trig-bfin-timer.c
710 710  
  711 +ANDROID DRIVERS
  712 +M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  713 +M: Arve Hjønnevåg <arve@android.com>
  714 +M: Riley Andrews <riandrews@android.com>
  715 +T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
  716 +L: devel@driverdev.osuosl.org
  717 +S: Supported
  718 +F: drivers/android/
  719 +F: drivers/staging/android/
  720 +
711 721 AOA (Apple Onboard Audio) ALSA DRIVER
712 722 M: Johannes Berg <johannes@sipsolutions.net>
713 723 L: linuxppc-dev@lists.ozlabs.org
drivers/staging/nvec/nvec.c
Diff comments   View file @ 5921dfe
... ... @@ -85,23 +85,20 @@
85 85 static const struct mfd_cell nvec_devices[] = {
86 86 {
87 87 .name = "nvec-kbd",
88   - .id = 1,
89 88 },
90 89 {
91 90 .name = "nvec-mouse",
92   - .id = 1,
93 91 },
94 92 {
95 93 .name = "nvec-power",
96   - .id = 1,
  94 + .id = 0,
97 95 },
98 96 {
99 97 .name = "nvec-power",
100   - .id = 2,
  98 + .id = 1,
101 99 },
102 100 {
103 101 .name = "nvec-paz00",
104   - .id = 1,
105 102 },
106 103 };
107 104  
... ... @@ -891,7 +888,7 @@
891 888 nvec_msg_free(nvec, msg);
892 889 }
893 890  
894   - ret = mfd_add_devices(nvec->dev, -1, nvec_devices,
  891 + ret = mfd_add_devices(nvec->dev, 0, nvec_devices,
895 892 ARRAY_SIZE(nvec_devices), NULL, 0, NULL);
896 893 if (ret)
897 894 dev_err(nvec->dev, "error adding subdevices\n");