tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd

Pull mtd fixes from Brian Norris:
"Two trivial MTD updates for 3.17-rc4:

- a tiny comment tweak, to kill a bunch of DocBook warnings added
during the merge window

- a small fixup to the OTP routines' error handling"

* tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd:
mtd: nand: fix DocBook warnings on nand_sdr_timings doc
mtd: cfi_cmdset_0002: check return code for get_chip()

Linus Torvalds 925e0ea4 86ba8b0a

+5 -1
+4
drivers/mtd/chips/cfi_cmdset_0002.c
··· 1434 1434 1435 1435 mutex_lock(&chip->mutex); 1436 1436 ret = get_chip(map, chip, base, FL_LOCKING); 1437 + if (ret) { 1438 + mutex_unlock(&chip->mutex); 1439 + return ret; 1440 + } 1437 1441 1438 1442 /* Enter lock register command */ 1439 1443 cfi_send_gen_cmd(0xAA, cfi->addr_unlock1,
+1 -1
include/linux/mtd/nand.h
··· 949 949 : 0; 950 950 } 951 951 952 - /** 952 + /* 953 953 * struct nand_sdr_timings - SDR NAND chip timings 954 954 * 955 955 * This struct defines the timing requirements of a SDR NAND chip.