linux/drivers/base, branch v3.8

Merge remote-tracking branch 'regmap/fix/debugfs' into tmp

2013-01-24T11:04:16Z

regmap: fix small typo in regmap_bulk_write comment

2013-01-22T08:24:12Z

Signed-off-by: Nestor Ovroy Signed-off-by: Mark Brown

drivers/base/cpu.c: Fix typo in comment

2013-01-16T20:34:34Z

[ We should make fun of people who can't speel too, but then we'd have no time for any real work at all - Linus ] Signed-off-by: Linus Torvalds

firmware: make sure the fw file size is not 0

2013-01-16T17:09:53Z

If the requested firmware file size is 0 bytes in the filesytem, we will try to vmalloc(0), which causes a warning: vmalloc: allocation failure: 0 bytes kworker/1:1: page allocation failure: order:0, mode:0xd2 __vmalloc_node_range+0x164/0x208 __vmalloc_node+0x4c/0x58 vmalloc+0x38/0x44 _request_firmware_load+0x220/0x6b0 request_firmware+0x64/0xc8 wl18xx_setup+0xb4/0x570 [wl18xx] wlcore_nvs_cb+0x64/0x9f8 [wlcore] request_firmware_work_func+0x94/0x100 process_one_work+0x1d0/0x750 worker_thread+0x184/0x4ac kthread+0xb4/0xc0 To fix this, check whether the file size is less than or equal to zero in fw_read_file_contents(). Cc: stable [3.7] Signed-off-by: Luciano Coelho Acked-by: Ming Lei Signed-off-by: Linus Torvalds

regmap: debugfs: Fix seeking from the cache

2013-01-16T15:33:36Z

We don't want to bomb out early if we failed to get the cache any more, just soldier on instead and we won't get confused and always return the first block. Reported-by: Philipp Zabel

Merge tag 'regmap-debugfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

2013-01-15T04:20:44Z

Pull regmap debugfs optimisation fixes from Mark Brown: "The debugfs optimisations merged in v3.8 weren't my finest hour, there were a number of cases that the more complex algorithm made worse especially around the error handling. This patch series should address those issues." * tag 'regmap-debugfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: debugfs: Make sure we store the last entry in the offset cache regmap: debugfs: Ensure a correct return value for empty caches regmap: debugfs: Discard the cache if we fail to allocate an entry regmap: debugfs: Fix check for block start in cached seeks regmap: debugfs: Fix attempts to read nonexistant register blocks

regmap: debugfs: Make sure we store the last entry in the offset cache

2013-01-08T20:52:51Z

Signed-off-by: Mark Brown

regmap: debugfs: Ensure a correct return value for empty caches

2013-01-08T20:52:49Z

This should never happen in the real world. Signed-off-by: Mark Brown

regmap: debugfs: Discard the cache if we fail to allocate an entry

2013-01-08T20:52:46Z

Rather than trying to soldier on with a partially allocated cache just throw the cache away and pretend we don't have one in case we can get a full cache next time around. Signed-off-by: Mark Brown

regmap: debugfs: Fix check for block start in cached seeks

2013-01-08T20:52:45Z

Check for the block we were asked to start from, not the position we're in. Signed-off-by: Mark Brown