5 files changed, 15 insertions, 8 deletions

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index a7e68c81f89d..a077cc86421b 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -68,13 +68,13 @@
 /* Defaults values */
 #define BMA180_DEF_PMODE        0
 #define BMA180_DEF_BW           20
-#define BMA180_DEF_SCALE        250
+#define BMA180_DEF_SCALE        2452
 
 /* Available values for sysfs */
 #define BMA180_FLP_FREQ_AVAILABLE \
         "10 20 40 75 150 300"
 #define BMA180_SCALE_AVAILABLE \
-        "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980"
+        "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"
 
 struct bma180_data {
         struct i2c_client *client;
@@ -94,7 +94,7 @@ enum bma180_axis {
 };
 
 static int bw_table[] = { 10, 20, 40, 75, 150, 300 }; /* Hz */
-static int scale_table[] = { 130, 190, 250, 380, 500, 990, 1980 };
+static int scale_table[] = { 1275, 1863, 2452, 3727, 4903, 9709, 19417 };
 
 static int bma180_get_acc_reg(struct bma180_data *data, enum bma180_axis axis)
 {
@@ -376,6 +376,8 @@ static int bma180_write_raw(struct iio_dev *indio_dev,
                 mutex_unlock(&data->mutex);
                 return ret;
         case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                if (val2)
+                        return -EINVAL;
                 mutex_lock(&data->mutex);
                 ret = bma180_set_bw(data, val);
                 mutex_unlock(&data->mutex);
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 36b1ae92e239..9f1a14009901 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -966,7 +966,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
 
         /* Now we have the two masks, work from least sig and build up sizes */
         for_each_set_bit(out_ind,
-                         indio_dev->active_scan_mask,
+                         buffer->scan_mask,
                          indio_dev->masklength) {
                 in_ind = find_next_bit(indio_dev->active_scan_mask,
                                        indio_dev->masklength,
diff --git a/drivers/staging/rtl8723au/os_dep/usb_intf.c b/drivers/staging/rtl8723au/os_dep/usb_intf.c
index 8b25c1aa2025..ebb19b22f47f 100644
--- a/drivers/staging/rtl8723au/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8723au/os_dep/usb_intf.c
@@ -530,8 +530,10 @@ int rtw_resume_process23a(struct rtw_adapter *padapter)
         pwrpriv->bkeepfwalive = false;
 
         DBG_8723A("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
-        if (pm_netdev_open23a(pnetdev, true) != 0)
+        if (pm_netdev_open23a(pnetdev, true) != 0) {
+                up(&pwrpriv->lock);
                 goto exit;
+        }
 
         netif_device_attach(pnetdev);
         netif_carrier_on(pnetdev);
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index 59679cd46816..69b80e80b011 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -981,7 +981,7 @@ start:
                 pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
         }
 
-        {
+        if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {
                 pDevice->byReAssocCount++;
                 /* 10 sec timeout */
                 if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) {
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 1d3908d044d0..5a5fd937a442 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -2318,6 +2318,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
         int             handled = 0;
         unsigned char byData = 0;
         int             ii = 0;
+        unsigned long flags;
 
         MACvReadISR(pDevice->PortOffset, &pDevice->dwIsr);
 
@@ -2331,7 +2332,8 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
 
         handled = 1;
         MACvIntDisable(pDevice->PortOffset);
-        spin_lock_irq(&pDevice->lock);
+
+        spin_lock_irqsave(&pDevice->lock, flags);
 
         //Make sure current page is 0
         VNSvInPortB(pDevice->PortOffset + MAC_REG_PAGE1SEL, &byOrgPageSel);
@@ -2560,7 +2562,8 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
         if (byOrgPageSel == 1)
                 MACvSelectPage1(pDevice->PortOffset);
 
-        spin_unlock_irq(&pDevice->lock);
+        spin_unlock_irqrestore(&pDevice->lock, flags);
+
         MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
 
         return IRQ_RETVAL(handled);