diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:09:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 08:09:04 +0200 |
| commit | 2f5bb02ff22414ce156cacb163dd594b017af357 (patch) | |
| tree | 5213feb307367fdffb993ed03ed3094ec92021ea /drivers/clocksource/timer-atmel-pit.c | |
| parent | 2c507e464f791327c94d17a0137f00b4717744fc (diff) | |
| parent | c6935931c1894ff857616ff8549b61236a19148f (diff) | |
| download | linux-2f5bb02ff22414ce156cacb163dd594b017af357.tar.gz linux-2f5bb02ff22414ce156cacb163dd594b017af357.tar.bz2 linux-2f5bb02ff22414ce156cacb163dd594b017af357.zip | |
Merge 4.8-rc5 into driver-core-next
We want the sysfs and kernfs in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/timer-atmel-pit.c')
| -rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index 3494bc5a21d5..7f0f5b26d8c5 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) static int __init at91sam926x_pit_dt_init(struct device_node *node) { struct pit_data *data; + int ret; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) |