Merge branch 'odroidxu-3.4.y' of github.com:hardkernel/linux into odr…

…oidxu-3.4.y
hardkernel · Oct 22, 2013 · 23da8fa · 23da8fa
2 parents 0252361 + da65a23
commit 23da8fa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/drivers/hardkernel/Kconfig b/drivers/hardkernel/Kconfig
@@ -22,11 +22,11 @@ config ODROIDXU_IOBOARD
  Enables the IOBOARD Drivers
 
 config ODROIDXU_IOBOARD_DEBUG
- bool "Enable the ODROIDXU IOBOARD DEBUG Message"
+ bool "Enable the ODROIDXU IOBOARD DEBUG Enable"
  depends on ODROIDXU_IOBOARD
  default n
  ---help---
- Enables the IOBOARD Debug Message 
+ Enables the IOBOARD Debug Message
 
 endmenu
 
diff --git a/drivers/hardkernel/ioboard-bmp180.c b/drivers/hardkernel/ioboard-bmp180.c
@@ -324,7 +324,7 @@ static int bmp180_detect(struct i2c_client *client)
 static int bmp180_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
  struct bmp180_data *bmp180;
- int err;
+ int err=0;
 
  bmp180 = kzalloc(sizeof(struct bmp180_data), GFP_KERNEL);
  if (!bmp180) {

diff --git a/drivers/hardkernel/ioboard-spi-misc.c b/drivers/hardkernel/ioboard-spi-misc.c
@@ -43,21 +43,21 @@ static long ioboard_spi_misc_ioctl(struct file *file, unsigned int cmd, unsigne
  switch (cmd) {
  case IOBOARD_IOCGREG :
  if(iocreg->cmd == IOBOARD_CMD_SPI_READ) {
- if(!ioboard_spi_read(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
+ if(ioboard_spi_read(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
  printk("%s : IOBOARD_IOCGREG error!\n", __func__); return -1;
  }
  }
  break;
  case IOBOARD_IOCSREG :
  if(iocreg->cmd == IOBOARD_CMD_SPI_WRITE) {
- if(!ioboard_spi_write(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
+ if(ioboard_spi_write(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
  printk("%s : IOBOARD_IOCSREG error!\n", __func__); return -1;
  }
  }
  break;
  case IOBOARD_IOCGSTATUS:
  if(iocreg->cmd == IOBOARD_CMD_SPI_ERASE) {
- if(!ioboard_spi_erase(spi->spi, iocreg->addr, iocreg->size)) {
+ if(ioboard_spi_erase(spi->spi, iocreg->addr, iocreg->size)) {
  printk("%s : IOBOARD_IOCSREG error!\n", __func__); return -1;
  }
  }

diff --git a/drivers/hardkernel/ioboard-spi.h b/drivers/hardkernel/ioboard-spi.h
@@ -42,8 +42,8 @@ struct ioboard_spi_iocreg {
  #define ERASE_SIZE_ALL 0xC7
 
 #define IOBOARD_IOCGREG _IOR('i', 1, struct ioboard_spi_iocreg *)
-#define IOBOARD_IOCSREG _IOR('i', 2, struct ioboard_spi_iocreg *)
-#define IOBOARD_IOCGSTATUS _IOR('i', 3, unsigned char *)
+#define IOBOARD_IOCSREG _IOW('i', 2, struct ioboard_spi_iocreg *)
+#define IOBOARD_IOCGSTATUS _IOW('i', 3, unsigned char *)
 
 //[*]--------------------------------------------------------------------------------------------------[*]
 struct ioboard_spi {