From e920c3d527568c4c4cdd8414ffe5ed5d4ba5eacb Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 23 Aug 2004 03:58:09 -0700 Subject: [PATCH] Fix up 0/NULL confusion --- drivers/ide/ide.c | 2 +- include/asm-ppc64/checksum.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index ce97619211488..e007a0816cf47 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -442,7 +442,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat) int opcode = 0x100; spin_lock(&ide_lock); - rq = 0; + rq = NULL; if (HWGROUP(drive)) rq = HWGROUP(drive)->rq; spin_unlock(&ide_lock); diff --git a/include/asm-ppc64/checksum.h b/include/asm-ppc64/checksum.h index 5ae7cdbe8ba82..d22d4469de431 100644 --- a/include/asm-ppc64/checksum.h +++ b/include/asm-ppc64/checksum.h @@ -84,10 +84,10 @@ static inline unsigned short ip_compute_csum(unsigned char * buff, int len) } #define csum_partial_copy_from_user(src, dst, len, sum, errp) \ - csum_partial_copy_generic((src), (dst), (len), (sum), (errp), 0) + csum_partial_copy_generic((src), (dst), (len), (sum), (errp), NULL) #define csum_partial_copy_nocheck(src, dst, len, sum) \ - csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0) + csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL) static inline u32 csum_tcpudp_nofold(u32 saddr, u32 daddr, -- 2.53.0