Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a52c8afd
Commit
a52c8afd
authored
Oct 18, 2008
by
David Woodhouse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.infradead.org/ubi-2.6
parents
faa5c2a1
762a9f29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
drivers/mtd/ubi/cdev.c
drivers/mtd/ubi/cdev.c
+1
-5
drivers/mtd/ubi/scan.c
drivers/mtd/ubi/scan.c
+1
-1
drivers/mtd/ubi/vtbl.c
drivers/mtd/ubi/vtbl.c
+2
-2
No files found.
drivers/mtd/ubi/cdev.c
View file @
a52c8afd
...
...
@@ -104,12 +104,9 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
struct
ubi_volume_desc
*
desc
;
int
vol_id
=
iminor
(
inode
)
-
1
,
mode
,
ubi_num
;
lock_kernel
();
ubi_num
=
ubi_major2num
(
imajor
(
inode
));
if
(
ubi_num
<
0
)
{
unlock_kernel
();
if
(
ubi_num
<
0
)
return
ubi_num
;
}
if
(
file
->
f_mode
&
FMODE_WRITE
)
mode
=
UBI_READWRITE
;
...
...
@@ -119,7 +116,6 @@ static int vol_cdev_open(struct inode *inode, struct file *file)
dbg_gen
(
"open volume %d, mode %d"
,
vol_id
,
mode
);
desc
=
ubi_open_volume
(
ubi_num
,
vol_id
,
mode
);
unlock_kernel
();
if
(
IS_ERR
(
desc
))
return
PTR_ERR
(
desc
);
...
...
drivers/mtd/ubi/scan.c
View file @
a52c8afd
...
...
@@ -387,7 +387,7 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_scan_info *si,
pnum
,
vol_id
,
lnum
,
ec
,
sqnum
,
bitflips
);
sv
=
add_volume
(
si
,
vol_id
,
pnum
,
vid_hdr
);
if
(
IS_ERR
(
sv
)
<
0
)
if
(
IS_ERR
(
sv
))
return
PTR_ERR
(
sv
);
if
(
si
->
max_sqnum
<
sqnum
)
...
...
drivers/mtd/ubi/vtbl.c
View file @
a52c8afd
...
...
@@ -244,8 +244,8 @@ static int vtbl_check(const struct ubi_device *ubi,
}
if
(
reserved_pebs
>
ubi
->
good_peb_count
)
{
dbg_err
(
"too large reserved_pebs, good PEBs %d"
,
ubi
->
good_peb_count
);
dbg_err
(
"too large reserved_pebs
%d
, good PEBs %d"
,
reserved_pebs
,
ubi
->
good_peb_count
);
err
=
9
;
goto
bad
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment