From 49ea255673247cc8eed838bc1b16a97a195e2324 Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Wed, 6 Dec 2006 20:36:17 -0800 Subject: [PATCH] --- yaml --- r: 42789 b: refs/heads/master c: 4740d387f3cb9e63f48f2488815b38a2c92755c8 h: refs/heads/master i: 42787: c640c6b5048abd38092c4ab4cd6de0b140900375 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7239dbd67a17..faefd8e2cc21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed2908f31398049c4371de9b100700e80704e95f +refs/heads/master: 4740d387f3cb9e63f48f2488815b38a2c92755c8 diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index 1a3c963dc48a..7d215eaa1370 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -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);