Merge branch 'for-next/misc'

6 files changed, 33 insertions, 6 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 630a84d585..15e424db1b 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -17,6 +17,8 @@
 #include <common.h>
 #include <errno.h>
 #include <malloc.h>
+#include <stringlist.h>
+#include <complete.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 
@@ -508,3 +510,23 @@ void clk_dump(int verbose)
 			dump_one(c, verbose, 0);
 	}
 }
+
+int clk_name_complete(struct string_list *sl, char *instr)
+{
+	struct clk *c;
+	int len;
+
+	if (!instr)
+		instr = "";
+
+	len = strlen(instr);
+
+	list_for_each_entry(c, &clks, list) {
+		if (strncmp(instr, c->name, len))
+			continue;
+
+		string_list_add_asprintf(sl, "%s ", c->name);
+	}
+
+	return COMPLETE_CONTINUE;
+}
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index dd90e17cb7..2ea66ed067 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -492,13 +492,13 @@ static int autoresize(struct ubi_device *ubi, int vol_id)
  * @vid_hdr_offset: VID header offset
  * @max_beb_per1024: maximum expected number of bad PEB per 1024 PEBs
  *
- * This function attaches MTD device @mtd_dev to UBI and assign @ubi_num number
+ * This function attaches MTD device @mtd_dev to UBI and assigns @ubi_num number
  * to the newly created UBI device, unless @ubi_num is %UBI_DEV_NUM_AUTO, in
  * which case this function finds a vacant device number and assigns it
  * automatically. Returns the new UBI device number in case of success and a
  * negative error code in case of failure.
  *
- * Note, the invocations of this function has to be serialized by the
+ * Note, the invocation of this function has to be serialized by the
  * @ubi_devices_mutex.
  */
 int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
@@ -693,7 +693,7 @@ out_free:
  * UBI device is busy and cannot be destroyed, and %-EINVAL if it does not
  * exist.
  *
- * Note, the invocations of this function has to be serialized by the
+ * Note, the invocation of this function has to be serialized by the
  * @ubi_devices_mutex.
  */
 int ubi_detach_mtd_dev(int ubi_num, int anyway)
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 77bcd179a8..6f9dddaf23 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -3600,6 +3600,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	e1000_get_ethaddr(edev, edev->ethaddr);
 
 	/* Set up the function pointers and register the device */
+	edev->parent = &pdev->dev;
 	edev->init = e1000_init;
 	edev->recv = e1000_poll;
 	edev->send = e1000_transmit;
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 9a30cb7e90..0ca359b0ba 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -72,8 +72,12 @@ static int kszphy_config_init(struct phy_device *phydev)
 
 static int ksz8021_config_init(struct phy_device *phydev)
 {
-	const u16 val = KSZPHY_OMSO_B_CAST_OFF | KSZPHY_OMSO_RMII_OVERRIDE;
+	u16 val;
+
+	val = phy_read(phydev, MII_KSZPHY_OMSO);
+	val |= KSZPHY_OMSO_B_CAST_OFF;
 	phy_write(phydev, MII_KSZPHY_OMSO, val);
+
 	return 0;
 }
 
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 1e6c33dbf2..767d4e1e36 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1631,7 +1631,7 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
 EXPORT_SYMBOL(of_get_next_available_child);
 
 /**
- *	of_get_next_child - Iterate a node childs
+ *	of_get_next_child - Iterate a node children
  *	@node:  parent node
  *	@prev:  previous child of the parent node, or NULL to get first
  *
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index b2253aa7a2..614e136de6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -525,7 +525,7 @@ void of_clean_reserve_map(void)
  * fdt_add_reserve_map - Add reserve map entries to a devicetree binary
  * @__fdt: The devicetree blob
  *
- * This adds the reservemap entries previously colllected in
+ * This adds the reservemap entries previously collected in
  * of_add_reserve_entry() to a devicetree binary blob. This also
  * adds the devicetree itself to the reserved list, so after calling
  * this function the tree should not be relocated anymore.