Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: tty: fix comment for __tty_alloc_driver() init/main: properly align the multi-line comment init/main: Fix double "the" in comment Fix dead URLs to ftp.kernel.org drivers: Clean up duplicated email address treewide: Fix typo in xml/driver-api/basics.xml tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall" selftests/timers: Spelling s/privledges/privileges/ HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/ net: phy: dp83848: Fix Typo UBI: Fix typos Documentation: ftrace.txt: Correct nice value of 120 priority net: fec: Fix typo in error msg and comment treewide: Fix typos in printk
This commit is contained in:
@@ -2002,7 +2002,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
|
||||
mii_speed--;
|
||||
if (mii_speed > 63) {
|
||||
dev_err(&pdev->dev,
|
||||
"fec clock (%lu) to fast to get right mii speed\n",
|
||||
"fec clock (%lu) too fast to get right mii speed\n",
|
||||
clk_get_rate(fep->clk_ipg));
|
||||
err = -EINVAL;
|
||||
goto err_out;
|
||||
@@ -2948,7 +2948,7 @@ static void set_multicast_list(struct net_device *ndev)
|
||||
}
|
||||
|
||||
/* only upper 6 bits (FEC_HASH_BITS) are used
|
||||
* which point to specific bit in he hash registers
|
||||
* which point to specific bit in the hash registers
|
||||
*/
|
||||
hash = (crc >> (32 - FEC_HASH_BITS)) & 0x3f;
|
||||
|
||||
|
Reference in New Issue
Block a user