Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13391c36 authored by Luca Weiss's avatar Luca Weiss
Browse files

Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3 

Linux 4.9.315

Change-Id: I72ebfe95cfd1c9ab23f3969e64eac3552ff529e6
parents e2d77c0f 41d9243e

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 314

SUBLEVEL = 315

EXTRAVERSION =

NAME = Roaring Lionus

drivers/hwmon/f71882fg.c

+3 −2
Original line number Diff line number Diff line
@@ -1590,8 +1590,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, 
		temp *= 125;

		if (sign)

			temp -= 128000;

	} else

		temp = data->temp[nr] * 1000;

	} else {

		temp = ((s8)data->temp[nr]) * 1000;

	}



	return sprintf(buf, "%d\n", temp);

}

drivers/net/ethernet/sfc/ef10.c

+5 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,11 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx) 
		n_parts++;

	}



	if (!n_parts) {

		kfree(parts);

		return 0;

	}



	rc = efx_mtd_add(efx, &parts[0].common, n_parts, sizeof(*parts));

fail:

	if (rc)

drivers/net/wireless/mac80211_hwsim.c

+3 −0
Original line number Diff line number Diff line
@@ -1987,11 +1987,13 @@ static void hw_scan_work(struct work_struct *work) 
				memcpy(skb_put(probe, req->ie_len), req->ie,

				       req->ie_len);



			rcu_read_lock();

			if (!ieee80211_tx_prepare_skb(hwsim->hw,

						      hwsim->hw_scan_vif,

						      probe,

						      hwsim->tmp_chan->band,

						      NULL)) {

				rcu_read_unlock();

				kfree_skb(probe);

				continue;

			}
@@ -1999,6 +2001,7 @@ static void hw_scan_work(struct work_struct *work) 
			local_bh_disable();

			mac80211_hwsim_tx_frame(hwsim->hw, probe,

						hwsim->tmp_chan);

			rcu_read_unlock();

			local_bh_enable();

		}

	}

drivers/s390/net/ctcm_mpc.c

+1 −5
Original line number Diff line number Diff line
@@ -624,8 +624,6 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) 
		ctcm_clear_busy_do(dev);

	}



	kfree(mpcginfo);



	return;



}
@@ -1205,10 +1203,10 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) 
						CTCM_FUNTAIL, dev->name);

			priv->stats.rx_dropped++;

			/* mpcginfo only used for non-data transfers */

			kfree(mpcginfo);

			if (do_debug_data)

				ctcmpc_dump_skb(pskb, -8);

		}

		kfree(mpcginfo);

	}

done:
@@ -1998,7 +1996,6 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) 
		}

		break;

	}

	kfree(mpcginfo);



	CTCM_PR_DEBUG("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i \n",

		__func__, ch->id, grp->outstanding_xid2,
@@ -2059,7 +2056,6 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg) 
		mpc_validate_xid(mpcginfo);

		break;

	}

	kfree(mpcginfo);

	return;

}