Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd58c0dd authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

eicon: fix sparse integer as NULL pointer warnings 



drivers/isdn/hardware/eicon/message.c:745:47: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:761:45: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9122:16: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9147:16: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/message.c:9173:14: warning: Using plain integer as NULL pointer
drivers/isdn/hardware/eicon/divasmain.c:396:23: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Karsten Keil <kkeil@suse.de>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e44b29d

drivers/isdn/hardware/eicon/divasmain.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ void diva_free_dma_map(void *hdev, struct _diva_dma_map_entry *pmap) 
	dma_addr_t dma_handle;

	void *addr_handle;



	for (i = 0; (pmap != 0); i++) {

	for (i = 0; (pmap != NULL); i++) {

		diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr);

		if (!cpu_addr) {

			break;

drivers/isdn/hardware/eicon/message.c

+6 −6
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static void start_internal_command (dword Id, PLCI *plci, t_std_internal_comma 
  else

  {

    i = 1;

    while (plci->internal_command_queue[i] != 0)

    while (plci->internal_command_queue[i] != NULL)

      i++;

    plci->internal_command_queue[i] = command_function;

  }
@@ -758,7 +758,7 @@ static void next_internal_command (dword Id, PLCI *plci) 


  plci->internal_command = 0;

  plci->internal_command_queue[0] = NULL;

  while (plci->internal_command_queue[1] != 0)

  while (plci->internal_command_queue[1] != NULL)

  {

    for (i = 0; i < MAX_INTERNAL_COMMAND_LEVELS - 1; i++)

      plci->internal_command_queue[i] = plci->internal_command_queue[i+1];
@@ -9119,7 +9119,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho 
        dbug(1,dprintf("AdvSigPlci=0x%x",a->AdvSignalPLCI));

        return 0x2001; /* codec in use by another application */

      }

      if(plci!=0)

      if(plci!=NULL)

      {

        a->AdvSignalPLCI = plci;

        plci->tel=ADV_VOICE;
@@ -9144,7 +9144,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho 
        }

                                               /* indicate D-ch connect if  */

      }                                        /* codec is connected OK     */

      if(plci!=0)

      if(plci!=NULL)

      {

        a->AdvSignalPLCI = plci;

        plci->tel=ADV_VOICE;
@@ -9170,7 +9170,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho 
  {

    if(hook_listen) return 0x300B;               /* Facility not supported */

                                                 /* no hook with SCOM      */

    if(plci!=0) plci->tel = CODEC;

    if(plci!=NULL) plci->tel = CODEC;

    dbug(1,dprintf("S/SCOM codec"));

    /* first time we use the scom-s codec we must shut down the internal   */

    /* handset application of the card. This can be done by an assign with */
@@ -14604,7 +14604,7 @@ static void channel_xmit_extended_xon (PLCI * plci) { 
  int max_ch = ARRAY_SIZE(a->ch_flow_control);

  int i, one_requested = 0;



  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == 0)) {

  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == NULL)) {

    return;

  }