aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 19:50:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 20:31:13 -0400
commita01e035ebb552223c03f2d9138ffc73f2d4d3965 (patch)
tree3d5516138e2c973ce51c808677faba2c52d15d0a /drivers
parenta6a3a17b7fdaf824e6d73e8e4a94c9d149302f74 (diff)
drivers: fix integer as NULL pointer warnings
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/cs5535_gpio.c2
-rw-r--r--drivers/char/n_hdlc.c2
-rw-r--r--drivers/char/rio/rioroute.c2
-rw-r--r--drivers/firmware/iscsi_ibft_find.c2
-rw-r--r--drivers/mtd/maps/plat-ram.c2
-rw-r--r--drivers/pci/pcie/aer/aerdrv_acpi.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/cs5535_gpio.c b/drivers/char/cs5535_gpio.c
index c2d23cae951..c0a4a0bb509 100644
--- a/drivers/char/cs5535_gpio.c
+++ b/drivers/char/cs5535_gpio.c
@@ -215,7 +215,7 @@ static int __init cs5535_gpio_init(void)
215 else 215 else
216 mask = 0x0b003c66; 216 mask = 0x0b003c66;
217 217
218 if (request_region(gpio_base, CS5535_GPIO_SIZE, NAME) == 0) { 218 if (!request_region(gpio_base, CS5535_GPIO_SIZE, NAME)) {
219 printk(KERN_ERR NAME ": can't allocate I/O for GPIO\n"); 219 printk(KERN_ERR NAME ": can't allocate I/O for GPIO\n");
220 return -ENODEV; 220 return -ENODEV;
221 } 221 }
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 82bcfb9c839..06803ed5568 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -501,7 +501,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
501 __FILE__,__LINE__, count); 501 __FILE__,__LINE__, count);
502 502
503 /* This can happen if stuff comes in on the backup tty */ 503 /* This can happen if stuff comes in on the backup tty */
504 if (n_hdlc == 0 || tty != n_hdlc->tty) 504 if (!n_hdlc || tty != n_hdlc->tty)
505 return; 505 return;
506 506
507 /* verify line is using HDLC discipline */ 507 /* verify line is using HDLC discipline */
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index 85091ff74d9..7a9df7dcf9a 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -526,7 +526,7 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit)
526 ** If RTA is not powered on, the tx packets will be 526 ** If RTA is not powered on, the tx packets will be
527 ** unset, so go no further. 527 ** unset, so go no further.
528 */ 528 */
529 if (PortP->TxStart == 0) { 529 if (!PortP->TxStart) {
530 rio_dprintk(RIO_DEBUG_ROUTE, "Tx pkts not set up yet\n"); 530 rio_dprintk(RIO_DEBUG_ROUTE, "Tx pkts not set up yet\n");
531 rio_spin_unlock_irqrestore(&PortP->portSem, flags); 531 rio_spin_unlock_irqrestore(&PortP->portSem, flags);
532 break; 532 break;
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index d0e5fa4ea51..11f17440fea 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -58,7 +58,7 @@ void __init reserve_ibft_region(void)
58 unsigned int len = 0; 58 unsigned int len = 0;
59 void *virt; 59 void *virt;
60 60
61 ibft_addr = 0; 61 ibft_addr = NULL;
62 62
63 for (pos = IBFT_START; pos < IBFT_END; pos += 16) { 63 for (pos = IBFT_START; pos < IBFT_END; pos += 16) {
64 /* The table can't be inside the VGA BIOS reserved space, 64 /* The table can't be inside the VGA BIOS reserved space,
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index f0b10ca0502..3eb2643b232 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -209,7 +209,7 @@ static int platram_probe(struct platform_device *pdev)
209 /* probe for the right mtd map driver 209 /* probe for the right mtd map driver
210 * supplied by the platform_data struct */ 210 * supplied by the platform_data struct */
211 211
212 if (pdata->map_probes != 0) { 212 if (pdata->map_probes) {
213 const char **map_probes = pdata->map_probes; 213 const char **map_probes = pdata->map_probes;
214 214
215 for ( ; !info->mtd && *map_probes; map_probes++) 215 for ( ; !info->mtd && *map_probes; map_probes++)
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 96ac54072f6..d39a78dbd02 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -31,7 +31,7 @@ int aer_osc_setup(struct pcie_device *pciedev)
31{ 31{
32 acpi_status status = AE_NOT_FOUND; 32 acpi_status status = AE_NOT_FOUND;
33 struct pci_dev *pdev = pciedev->port; 33 struct pci_dev *pdev = pciedev->port;
34 acpi_handle handle = 0; 34 acpi_handle handle = NULL;
35 35
36 if (acpi_pci_disabled) 36 if (acpi_pci_disabled)
37 return -1; 37 return -1;