Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 7dc7a9dad6ac..8d2bea09a4ec 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -311,14 +311,14 @@ int call_usermodehelper_pipe(char *path, char **argv, char **envp,
                 return 0;
 
         f = create_write_pipe();
-        if (!f)
-                return -ENOMEM;
+        if (IS_ERR(f))
+                return PTR_ERR(f);
         *filp = f;
 
         f = create_read_pipe(f);
-        if (!f) {
+        if (IS_ERR(f)) {
                 free_write_pipe(*filp);
-                return -ENOMEM;
+                return PTR_ERR(f);
         }
         sub_info.stdin = f;