Commit 4740d387 authored Dec 06, 2006 by Hans-Christian Egtvedt Committed by Linus Torvalds Dec 07, 2006

[PATCH] spi: correct bus_num and buffer bug in spi core



Correct the following in driver/spi/spi.c in function spi_busnum_to_master:

 * must allow bus_num 0, the if is really not needed.
 * correct the name buffer which is too small for bus_num >= 10000. It

should be 9 bytes big, not 8.

Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent ed2908f3

drivers/spi/spi.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -465,15 +465,13 @@ EXPORT_SYMBOL_GPL(spi_unregister_master);
		*/
		struct spi_master *spi_busnum_to_master(u16 bus_num)
		{
		if (bus_num) {
		char name[8];
		char name[9];
		struct kobject *bus;

		snprintf(name, sizeof name, "spi%u", bus_num);
		bus = kset_find_obj(&spi_master_class.subsys.kset, name);
		if (bus)
		return container_of(bus, struct spi_master, cdev.kobj);
		}
		return NULL;
		}
		EXPORT_SYMBOL_GPL(spi_busnum_to_master);