From: Thomas Renninger Date: Thu, 29 Jul 2010 10:27:59 +0000 (+0200) Subject: hp-wmi: Fix mixing up of and/or directive X-Git-Tag: v2.6.36-rc1~579^2~16 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4775062d57c762de37ff93fb5f8611320c25e2a;p=pandora-kernel.git hp-wmi: Fix mixing up of and/or directive This should have been an "and". Additionally checking for !obj is even better. Signed-off-by: Thomas Renninger CC: linux-acpi@vger.kernel.or CC: platform-driver-x86@vger.kernel.org CC: mjg@redhat.com Signed-off-by: Matthew Garrett --- Reading git-diff-tree failed