Skip to content

Commit 23da8fa

Browse files
committed
Merge branch 'odroidxu-3.4.y' of github.com:hardkernel/linux into odroidxu-3.4.y
2 parents 0252361 + da65a23 commit 23da8fa

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

drivers/hardkernel/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ config ODROIDXU_IOBOARD
2222
Enables the IOBOARD Drivers
2323

2424
config ODROIDXU_IOBOARD_DEBUG
25-
bool "Enable the ODROIDXU IOBOARD DEBUG Message"
25+
bool "Enable the ODROIDXU IOBOARD DEBUG Enable"
2626
depends on ODROIDXU_IOBOARD
2727
default n
2828
---help---
29-
Enables the IOBOARD Debug Message
29+
Enables the IOBOARD Debug Message
3030

3131
endmenu
3232

drivers/hardkernel/ioboard-bmp180.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ static int bmp180_detect(struct i2c_client *client)
324324
static int bmp180_probe(struct i2c_client *client, const struct i2c_device_id *id)
325325
{
326326
struct bmp180_data *bmp180;
327-
int err;
327+
int err=0;
328328

329329
bmp180 = kzalloc(sizeof(struct bmp180_data), GFP_KERNEL);
330330
if (!bmp180) {

drivers/hardkernel/ioboard-spi-misc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ static long ioboard_spi_misc_ioctl(struct file *file, unsigned int cmd, unsigne
4343
switch (cmd) {
4444
case IOBOARD_IOCGREG :
4545
if(iocreg->cmd == IOBOARD_CMD_SPI_READ) {
46-
if(!ioboard_spi_read(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
46+
if(ioboard_spi_read(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
4747
printk("%s : IOBOARD_IOCGREG error!\n", __func__); return -1;
4848
}
4949
}
5050
break;
5151
case IOBOARD_IOCSREG :
5252
if(iocreg->cmd == IOBOARD_CMD_SPI_WRITE) {
53-
if(!ioboard_spi_write(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
53+
if(ioboard_spi_write(spi->spi, iocreg->addr, &iocreg->rwdata[0], iocreg->size)) {
5454
printk("%s : IOBOARD_IOCSREG error!\n", __func__); return -1;
5555
}
5656
}
5757
break;
5858
case IOBOARD_IOCGSTATUS:
5959
if(iocreg->cmd == IOBOARD_CMD_SPI_ERASE) {
60-
if(!ioboard_spi_erase(spi->spi, iocreg->addr, iocreg->size)) {
60+
if(ioboard_spi_erase(spi->spi, iocreg->addr, iocreg->size)) {
6161
printk("%s : IOBOARD_IOCSREG error!\n", __func__); return -1;
6262
}
6363
}

drivers/hardkernel/ioboard-spi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ struct ioboard_spi_iocreg {
4242
#define ERASE_SIZE_ALL 0xC7
4343

4444
#define IOBOARD_IOCGREG _IOR('i', 1, struct ioboard_spi_iocreg *)
45-
#define IOBOARD_IOCSREG _IOR('i', 2, struct ioboard_spi_iocreg *)
46-
#define IOBOARD_IOCGSTATUS _IOR('i', 3, unsigned char *)
45+
#define IOBOARD_IOCSREG _IOW('i', 2, struct ioboard_spi_iocreg *)
46+
#define IOBOARD_IOCGSTATUS _IOW('i', 3, unsigned char *)
4747

4848
//[*]--------------------------------------------------------------------------------------------------[*]
4949
struct ioboard_spi {

0 commit comments

Comments
 (0)