Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f5796e authored by Al Viro's avatar Al Viro
Browse files

hp_sdc: use probe_kernel_read()



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent fd7e8816
Loading
Loading
Loading
Loading
+1 −5
Original line number Original line Diff line number Diff line
@@ -1001,7 +1001,6 @@ static int __init hp_sdc_register(void)
	uint8_t tq_init_seq[5];
	uint8_t tq_init_seq[5];
	struct semaphore tq_init_sem;
	struct semaphore tq_init_sem;
#if defined(__mc68000__)
#if defined(__mc68000__)
	mm_segment_t fs;
	unsigned char i;
	unsigned char i;
#endif
#endif


@@ -1026,11 +1025,8 @@ static int __init hp_sdc_register(void)
	hp_sdc.base_io	 = (unsigned long) 0xf0428000;
	hp_sdc.base_io	 = (unsigned long) 0xf0428000;
	hp_sdc.data_io	 = (unsigned long) hp_sdc.base_io + 1;
	hp_sdc.data_io	 = (unsigned long) hp_sdc.base_io + 1;
	hp_sdc.status_io = (unsigned long) hp_sdc.base_io + 3;
	hp_sdc.status_io = (unsigned long) hp_sdc.base_io + 3;
	fs = get_fs();
	if (!probe_kernel_read(&i, (unsigned char *)hp_sdc.data_io, 1))
	set_fs(KERNEL_DS);
	if (!get_user(i, (unsigned char *)hp_sdc.data_io))
		hp_sdc.dev = (void *)1;
		hp_sdc.dev = (void *)1;
	set_fs(fs);
	hp_sdc.dev_err   = hp_sdc_init();
	hp_sdc.dev_err   = hp_sdc_init();
#endif
#endif
	if (hp_sdc.dev == NULL) {
	if (hp_sdc.dev == NULL) {