null pointer error
This commit is contained in:
commit
aa3b03202d
|
@ -23,9 +23,12 @@ static void boom(void) {
|
||||||
printk(" ⠀⠀⠀⠀⠀⠀⠀⠀⠐⠋⠁⠠⠃⠀⠈⠀⠈⠙⠂⠀⠀⠀⠀⠀⠀⠀⠀\n");
|
printk(" ⠀⠀⠀⠀⠀⠀⠀⠀⠐⠋⠁⠠⠃⠀⠈⠀⠈⠙⠂⠀⠀⠀⠀⠀⠀⠀⠀\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
|
||||||
static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
|
static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
|
||||||
timer = NULL;
|
timer = NULL;
|
||||||
printk("Three...\n");
|
printk("Three...\n");
|
||||||
|
@ -36,7 +39,11 @@ static enum hrtimer_restart sst_cb(struct hrtimer *timer) {
|
||||||
mdelay(1000);
|
mdelay(1000);
|
||||||
boom();
|
boom();
|
||||||
// Marvin knows everything about cookies.
|
// Marvin knows everything about cookies.
|
||||||
|
<<<<<<< HEAD
|
||||||
//timer->function = NULL;
|
//timer->function = NULL;
|
||||||
|
=======
|
||||||
|
timer->function = NULL;
|
||||||
|
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
|
||||||
return HRTIMER_NORESTART;
|
return HRTIMER_NORESTART;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,5 +53,8 @@ void arm_sst(void) {
|
||||||
|
|
||||||
printk("Armed the universe's timer.\n");
|
printk("Armed the universe's timer.\n");
|
||||||
hrtimer_start(&timer, ms_to_ktime(75000), HRTIMER_MODE_REL);
|
hrtimer_start(&timer, ms_to_ktime(75000), HRTIMER_MODE_REL);
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 872f2f071428594c941a76a302e55e515be334d1
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue