git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] hda-codec - Add speaker automute to ALC260 HP models
[safe/jmp/linux-2.6]
/
drivers
/
spi
/
spi_imx.c
diff --git
a/drivers/spi/spi_imx.c
b/drivers/spi/spi_imx.c
index
3b4650a
..
2cd8573
100644
(file)
--- a/
drivers/spi/spi_imx.c
+++ b/
drivers/spi/spi_imx.c
@@
-1194,7
+1194,7
@@
static int setup(struct spi_device *spi)
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
if (!chip) {
dev_err(&spi->dev,
chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL);
if (!chip) {
dev_err(&spi->dev,
- "setup - cannot allocate controller state");
+ "setup - cannot allocate controller state
\n
");
return -ENOMEM;
}
chip->control = SPI_DEFAULT_CONTROL;
return -ENOMEM;
}
chip->control = SPI_DEFAULT_CONTROL;
@@
-1206,7
+1206,7
@@
static int setup(struct spi_device *spi)
if (!chip_info) {
dev_err(&spi->dev,
"setup - "
if (!chip_info) {
dev_err(&spi->dev,
"setup - "
- "cannot allocate controller data");
+ "cannot allocate controller data
\n
");
status = -ENOMEM;
goto err_first_setup;
}
status = -ENOMEM;
goto err_first_setup;
}
@@
-1758,5
+1758,5
@@
static void __exit spi_imx_exit(void)
module_exit(spi_imx_exit);
MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
module_exit(spi_imx_exit);
MODULE_AUTHOR("Andrea Paterniani, <a.paterniani@swapp-eng.it>");
-MODULE_DESCRIPTION("iMX SPI Contoller Driver");
+MODULE_DESCRIPTION("iMX SPI Cont
r
oller Driver");
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");