mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'master' into export-slabh
This commit is contained in:
commit
336f5899d2
183 changed files with 4561 additions and 2618 deletions
|
|
@ -1454,8 +1454,10 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
|
|||
if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) {
|
||||
err = sunsu_kbd_ms_init(up);
|
||||
if (err) {
|
||||
of_iounmap(&op->resource[0],
|
||||
up->port.membase, up->reg_size);
|
||||
kfree(up);
|
||||
goto out_unmap;
|
||||
return err;
|
||||
}
|
||||
dev_set_drvdata(&op->dev, up);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue