Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd (925e0ea4) · Commits · 戴 / test

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()

drivers/mtd/chips/cfi_cmdset_0002.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1434,6 +1434,10 @@ static int cfi_amdstd_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,

		mutex_lock(&chip->mutex);
		ret = get_chip(map, chip, base, FL_LOCKING);
		if (ret) {
		mutex_unlock(&chip->mutex);
		return ret;
		}

		/* Enter lock register command */
		cfi_send_gen_cmd(0xAA, cfi->addr_unlock1,

include/linux/mtd/nand.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -949,7 +949,7 @@ static inline int jedec_feature(struct nand_chip *chip)
		: 0;
		}

		/**
		/*
		* struct nand_sdr_timings - SDR NAND chip timings
		*
		* This struct defines the timing requirements of a SDR NAND chip.

Admin message