diff --git a/[refs] b/[refs] index b6e4e796ad02..d01a81a3d21c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fd6a53ddc75d02ad0f363cb42f2a1cec6b701c2 +refs/heads/master: 706b7e1573d7b7ad7825e84a6dcfb3d533993b83 diff --git a/trunk/arch/x86/kernel/scx200_32.c b/trunk/arch/x86/kernel/scx200_32.c index 87bc159d29df..7e004acbe526 100644 --- a/trunk/arch/x86/kernel/scx200_32.c +++ b/trunk/arch/x86/kernel/scx200_32.c @@ -65,7 +65,7 @@ static int __devinit scx200_probe(struct pci_dev *pdev, const struct pci_device_ base = pci_resource_start(pdev, 0); printk(KERN_INFO NAME ": GPIO base 0x%x\n", base); - if (request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO") == 0) { + if (!request_region(base, SCx200_GPIO_SIZE, "NatSemi SCx200 GPIO")) { printk(KERN_ERR NAME ": can't allocate I/O for GPIOs\n"); return -EBUSY; }