projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: usbhid: Fix flood of "control queue full" messages
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-omap2-mcspi.c
diff --git
a/drivers/spi/spi-omap2-mcspi.c
b/drivers/spi/spi-omap2-mcspi.c
index
ede7f05
..
60c9cdf
100644
(file)
--- a/
drivers/spi/spi-omap2-mcspi.c
+++ b/
drivers/spi/spi-omap2-mcspi.c
@@
-4,7
+4,7
@@
*
* Copyright (C) 2005, 2006 Nokia Corporation
* Author: Samuel Ortiz <samuel.ortiz@nokia.com> and
*
* Copyright (C) 2005, 2006 Nokia Corporation
* Author: Samuel Ortiz <samuel.ortiz@nokia.com> and
- * Juha Yrj
�l�
<juha.yrjola@nokia.com>
+ * Juha Yrj
ola
<juha.yrjola@nokia.com>
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-1054,7
+1054,7
@@
static int omap2_mcspi_setup(struct spi_device *spi)
struct omap2_mcspi_cs *cs = spi->controller_state;
if (!cs) {
struct omap2_mcspi_cs *cs = spi->controller_state;
if (!cs) {
- cs = kzalloc(sizeof
*cs
, GFP_KERNEL);
+ cs = kzalloc(sizeof
(*cs)
, GFP_KERNEL);
if (!cs)
return -ENOMEM;
cs->base = mcspi->base + spi->chip_select * 0x14;
if (!cs)
return -ENOMEM;
cs->base = mcspi->base + spi->chip_select * 0x14;