[PATCH] [2.6.18] Correct bus_num and buffer bug in spi core

[PATCH] [2.6.18] Correct bus_num and buffer bug in spi core

[Hans-Christian Egtvedt]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

Hello,

Included is a patch which corrects 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.

Sorry if I should have split the patch in two.

I am not on the linux-kernel list.

Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com>

-- 
With kind regards,

Hans-Christian Egtvedt
Applications Engineer - AVR Applications Lab

[-- Attachment #2: spi-fix-spi-busnum-to-master-buffer-and-bus_num-0.patch --]
[-- Type: text/x-patch, Size: 778 bytes --]

--- a/drivers/spi/spi.c	2006-10-19 10:37:26.000000000 +0200
+++ b/drivers/spi/spi.c	2006-10-19 10:38:59.000000000 +0200
@@ -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];
-		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);
-	}
+	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);