git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
[pandora-kernel.git]
/
drivers
/
misc
/
ti-st
/
st_kim.c
diff --git
a/drivers/misc/ti-st/st_kim.c
b/drivers/misc/ti-st/st_kim.c
index
5da93ee
..
38fd2f0
100644
(file)
--- a/
drivers/misc/ti-st/st_kim.c
+++ b/
drivers/misc/ti-st/st_kim.c
@@
-245,9
+245,9
@@
void skip_change_remote_baud(unsigned char **ptr, long *len)
pr_err("invalid action after change remote baud command");
} else {
*ptr = *ptr + sizeof(struct bts_action) +
pr_err("invalid action after change remote baud command");
} else {
*ptr = *ptr + sizeof(struct bts_action) +
- ((struct bts_action *)
nxt
_action)->size;
+ ((struct bts_action *)
cur
_action)->size;
*len = *len - (sizeof(struct bts_action) +
*len = *len - (sizeof(struct bts_action) +
- ((struct bts_action *)
nxt
_action)->size);
+ ((struct bts_action *)
cur
_action)->size);
/* warn user on not commenting these in firmware */
pr_warn("skipping the wait event of change remote baud");
}
/* warn user on not commenting these in firmware */
pr_warn("skipping the wait event of change remote baud");
}
@@
-604,6
+604,10
@@
void st_kim_ref(struct st_data_s **core_data, int id)
struct kim_data_s *kim_gdata;
/* get kim_gdata reference from platform device */
pdev = st_get_plat_device(id);
struct kim_data_s *kim_gdata;
/* get kim_gdata reference from platform device */
pdev = st_get_plat_device(id);
+ if (!pdev) {
+ *core_data = NULL;
+ return;
+ }
kim_gdata = dev_get_drvdata(&pdev->dev);
*core_data = kim_gdata->core_data;
}
kim_gdata = dev_get_drvdata(&pdev->dev);
*core_data = kim_gdata->core_data;
}