Merged nuttx/nuttx into master

This commit is contained in:
Masayuki Ishikawa
2017-05-23 16:00:20 +09:00
3 changed files with 6 additions and 5 deletions
+3 -2
View File
@@ -113,6 +113,7 @@ static int bch_open(FAR struct file *filep)
{
FAR struct inode *inode = filep->f_inode;
FAR struct bchlib_s *bch;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
@@ -122,7 +123,7 @@ static int bch_open(FAR struct file *filep)
bchlib_semtake(bch);
if (bch->refs == MAX_OPENCNT)
{
return -EMFILE;
ret = -EMFILE;
}
else
{
@@ -130,7 +131,7 @@ static int bch_open(FAR struct file *filep)
}
bchlib_semgive(bch);
return OK;
return ret;
}
/****************************************************************************
+1 -1
View File
@@ -218,7 +218,7 @@ int pipe2(int fd[2], size_t bufsize)
/* Create a pathname to the pipe device */
sprintf(devname, "/dev/pipe%d", pipeno);
snprintf(devname, sizeof(devname), "/dev/pipe%d", pipeno);
/* Check if the pipe device has already been created */
+2 -2
View File
@@ -547,7 +547,7 @@ static ssize_t fat_read(FAR struct file *filep, FAR char *buffer,
ret = fat_currentsector(fs, ff, filep->f_pos);
if (ret < 0)
{
return ret;
goto errout_with_semaphore;
}
}
@@ -799,7 +799,7 @@ static ssize_t fat_write(FAR struct file *filep, FAR const char *buffer,
ret = fat_currentsector(fs, ff, filep->f_pos);
if (ret < 0)
{
return ret;
goto errout_with_semaphore;
}
}