7 files changed, 30 insertions, 21 deletions

diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig
index 9e1864c6dfd..8190f2aaf53 100644
--- a/drivers/staging/et131x/Kconfig
+++ b/drivers/staging/et131x/Kconfig
@@ -1,6 +1,7 @@
 config ET131X
         tristate "Agere ET-1310 Gigabit Ethernet support"
-        depends on PCI
+        depends on PCI && NET && NETDEVICES
+        select PHYLIB
         default n
         ---help---
           This driver supports Agere ET-1310 ethernet adapters.
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index f5f44a02456..0c1c6ca8c37 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -4469,6 +4469,12 @@ static int et131x_resume(struct device *dev)
         return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
+#define ET131X_PM_OPS (&et131x_pm_ops)
+#else
+#define ET131X_PM_OPS NULL
+#endif
+
 /* ISR functions */
 
 /**
@@ -5470,12 +5476,6 @@ err_out:
         return result;
 }
 
-static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
-#define ET131X_PM_OPS (&et131x_pm_ops)
-#else
-#define ET131X_PM_OPS NULL
-#endif
-
 static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {
         { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL},
         { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL},
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 326e967d54e..aec9311b108 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -242,19 +242,26 @@ static const struct file_operations iio_event_chrdev_fileops = {
 
 static int iio_event_getfd(struct iio_dev *indio_dev)
 {
-        if (indio_dev->event_interface == NULL)
+        struct iio_event_interface *ev_int = indio_dev->event_interface;
+        int fd;
+
+        if (ev_int == NULL)
                 return -ENODEV;
 
-        mutex_lock(&indio_dev->event_interface->event_list_lock);
-        if (test_and_set_bit(IIO_BUSY_BIT_POS,
-                             &indio_dev->event_interface->flags)) {
-                mutex_unlock(&indio_dev->event_interface->event_list_lock);
+        mutex_lock(&ev_int->event_list_lock);
+        if (test_and_set_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) {
+                mutex_unlock(&ev_int->event_list_lock);
                 return -EBUSY;
         }
-        mutex_unlock(&indio_dev->event_interface->event_list_lock);
-        return anon_inode_getfd("iio:event",
-                                &iio_event_chrdev_fileops,
-                                indio_dev->event_interface, O_RDONLY);
+        mutex_unlock(&ev_int->event_list_lock);
+        fd = anon_inode_getfd("iio:event",
+                                &iio_event_chrdev_fileops, ev_int, O_RDONLY);
+        if (fd < 0) {
+                mutex_lock(&ev_int->event_list_lock);
+                clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);
+                mutex_unlock(&ev_int->event_list_lock);
+        }
+        return fd;
 }
 
 static int __init iio_init(void)
diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c
index d335c7d6fa0..828526d4c28 100644
--- a/drivers/staging/media/as102/as102_drv.c
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -32,8 +32,8 @@
 #include "as102_fw.h"
 #include "dvbdev.h"
 
-int debug;
-module_param_named(debug, debug, int, 0644);
+int as102_debug;
+module_param_named(debug, as102_debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)");
 
 int dual_tuner;
diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index bcda635b5a9..fd33f5a12dc 100644
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -37,7 +37,8 @@ extern struct spi_driver as102_spi_driver;
 #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
 #define DRIVER_NAME "as10x_usb"
 
-extern int debug;
+extern int as102_debug;
+#define debug   as102_debug
 
 #define dprintk(debug, args...) \
         do { if (debug) {       \
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index b445cd63f90..2542c374390 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -275,7 +275,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
                 CVM_OCT_SKB_CB(skb)[0] = hw_buffer.u64;
                 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                         struct skb_frag_struct *fs = skb_shinfo(skb)->frags + i;
-                        hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page) + fs->page_offset));
+                        hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)(page_address(fs->page.p) + fs->page_offset));
                         hw_buffer.s.size = fs->size;
                         CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
                 }
diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig
index 5cde96b2e6e..5c2a15b42df 100644
--- a/drivers/staging/slicoss/Kconfig
+++ b/drivers/staging/slicoss/Kconfig
@@ -1,6 +1,6 @@
 config SLICOSS
         tristate "Alacritech Gigabit IS-NIC support"
-        depends on PCI && X86
+        depends on PCI && X86 && NET
         default n
         help
           This driver supports Alacritech's IS-NIC gigabit ethernet cards.