4 files changed, 17 insertions, 11 deletions

diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 3bc992cd70b7..f6a71092e135 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -50,7 +50,7 @@ config TI_DAVINCI_CPDMA
           will be called davinci_cpdma.  This is recommended.
 
 config TI_CPSW_PHY_SEL
-        boolean "TI CPSW Switch Phy sel Support"
+        bool "TI CPSW Switch Phy sel Support"
         depends on TI_CPSW
         ---help---
           This driver supports configuring of the phy mode connected to
@@ -77,7 +77,7 @@ config TI_CPSW
           will be called cpsw.
 
 config TI_CPTS
-        boolean "TI Common Platform Time Sync (CPTS) Support"
+        bool "TI Common Platform Time Sync (CPTS) Support"
         depends on TI_CPSW
         select PTP_1588_CLOCK
         ---help---
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 0732f9e16128..7ba8d0885f12 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -398,14 +398,14 @@ config USB_NET_CDC_SUBSET
           not generally have permanently assigned Ethernet addresses.
 
 config USB_ALI_M5632
-        boolean "ALi M5632 based 'USB 2.0 Data Link' cables"
+        bool "ALi M5632 based 'USB 2.0 Data Link' cables"
         depends on USB_NET_CDC_SUBSET
         help
           Choose this option if you're using a host-to-host cable
           based on this design, which supports USB 2.0 high speed.
 
 config USB_AN2720
-        boolean "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
+        bool "AnchorChips 2720 based cables (Xircom PGUNET, ...)"
         depends on USB_NET_CDC_SUBSET
         help
           Choose this option if you're using a host-to-host cable
@@ -413,7 +413,7 @@ config USB_AN2720
           Cypress brand.
 
 config USB_BELKIN
-        boolean "eTEK based host-to-host cables (Advance, Belkin, ...)"
+        bool "eTEK based host-to-host cables (Advance, Belkin, ...)"
         depends on USB_NET_CDC_SUBSET
         default y
         help
@@ -422,7 +422,7 @@ config USB_BELKIN
           microcontroller, with LEDs that indicate traffic.
 
 config USB_ARMLINUX
-        boolean "Embedded ARM Linux links (iPaq, ...)"
+        bool "Embedded ARM Linux links (iPaq, ...)"
         depends on USB_NET_CDC_SUBSET
         default y
         help
@@ -439,14 +439,14 @@ config USB_ARMLINUX
           this simpler protocol by installing a different kernel.
 
 config USB_EPSON2888
-        boolean "Epson 2888 based firmware (DEVELOPMENT)"
+        bool "Epson 2888 based firmware (DEVELOPMENT)"
         depends on USB_NET_CDC_SUBSET
         help
           Choose this option to support the usb networking links used
           by some sample firmware from Epson.
 
 config USB_KC2190
-        boolean "KT Technology KC2190 based cables (InstaNet)"
+        bool "KT Technology KC2190 based cables (InstaNet)"
         depends on USB_NET_CDC_SUBSET
         help
           Choose this option if you're using a host-to-host cable
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 110a2cf67244..f1ff3666f090 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1710,6 +1710,12 @@ static int virtnet_probe(struct virtio_device *vdev)
         struct virtnet_info *vi;
         u16 max_queue_pairs;
 
+        if (!vdev->config->get) {
+                dev_err(&vdev->dev, "%s failure: config access disabled\n",
+                        __func__);
+                return -EINVAL;
+        }
+
         if (!virtnet_validate_features(vdev))
                 return -EINVAL;
 
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 006b8bcb2e31..2b4ef256c6b9 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -243,14 +243,14 @@ config RT2X00_LIB
         select AVERAGE
 
 config RT2X00_LIB_FIRMWARE
-        boolean
+        bool
         select FW_LOADER
 
 config RT2X00_LIB_CRYPTO
-        boolean
+        bool
 
 config RT2X00_LIB_LEDS
-        boolean
+        bool
         default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
 
 config RT2X00_LIB_DEBUGFS