block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p) (b9f985b6) · Commits · e / devices / android_kernel_fairphone_FP5

block/genhd.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -735,7 +735,7 @@ static void show_partition_start(struct seq_file seqf, loff_t *pos)
	static void *p;		static void *p;

	p = disk_seqf_start(seqf, pos);		p = disk_seqf_start(seqf, pos);
	if (!IS_ERR(p) && p && !*pos)		if (!IS_ERR_OR_NULL(p) && !*pos)
	seq_puts(seqf, "major minor #blocks name\n\n");		seq_puts(seqf, "major minor #blocks name\n\n");
	return p;		return p;
	}		}