Commit ef9efe43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'warnings' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/atm/ambassador: kill uninit'd var warning, and fix bug
  [libata] sata_mv: use pci_try_set_mwi()
  drivers/infiniband/hw/mthca/mthca_qp: kill uninit'd var warning
  drivers/net/wan/sbni: kill uninit'd var warning
  drivers/mtd/ubi/eba: minor cleanup: tighten scope of a local var
  drivers/telephony/ixj: cleanup and fix gcc warning
  drivers/net/wan/pc300_drv: fix bug caught by gcc warning
  drivers/usb/misc/auerswald: fix status check, remove redundant check
  [netdrvr] eepro100, ne2k-pci: abort resume if pci_enable_device() fails
  [netdrvr] natsemi: Fix device removal bug
  kernel/auditfilter: kill bogus uninit'd-var compiler warning
parents 8dfd588c b1734d23

drivers/ata/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -2666,7 +2666,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	mv_print_info(host);



	pci_set_master(pdev);

	pci_set_mwi(pdev);

	pci_try_set_mwi(pdev);

	return ata_host_activate(host, pdev->irq, mv_interrupt, IRQF_SHARED,

				 IS_GEN_I(hpriv) ? &mv5_sht : &mv6_sht);

}

drivers/atm/ambassador.c

+3 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int amb_open (struct atm_vcc * atm_vcc) 
  struct atm_qos * qos;

  struct atm_trafprm * txtp;

  struct atm_trafprm * rxtp;

  u16 tx_rate_bits;

  u16 tx_rate_bits = -1; // hush gcc

  u16 tx_vc_bits = -1; // hush gcc

  u16 tx_frame_bits = -1; // hush gcc
@@ -1096,6 +1096,8 @@ static int amb_open (struct atm_vcc * atm_vcc) 
	    r = round_up;

	  }

	  error = make_rate (pcr, r, &tx_rate_bits, NULL);

	  if (error)

	    return error;

	  tx_vc_bits = TX_UBR_CAPPED;

	  tx_frame_bits = TX_FRAME_CAPPED;

	}

drivers/infiniband/hw/mthca/mthca_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
	int i;

	int size;

	int size0 = 0;

	u32 f0;

	u32 f0 = 0;

	int ind;

	u8 op0 = 0;
@@ -1946,7 +1946,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
	int i;

	int size;

	int size0 = 0;

	u32 f0;

	u32 f0 = 0;

	int ind;

	u8 op0 = 0;

drivers/mtd/ubi/eba.c

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int ubi_eba_read_leb(struct ubi_device *ubi, int vol_id, int lnum, void *buf, 
	int err, pnum, scrub = 0, idx = vol_id2idx(ubi, vol_id);

	struct ubi_vid_hdr *vid_hdr;

	struct ubi_volume *vol = ubi->volumes[idx];

	uint32_t crc, crc1;

	uint32_t crc;



	err = leb_read_lock(ubi, vol_id, lnum);

	if (err)
@@ -451,7 +451,7 @@ retry: 
	}



	if (check) {

		crc1 = crc32(UBI_CRC32_INIT, buf, len);

		uint32_t crc1 = crc32(UBI_CRC32_INIT, buf, len);

		if (crc1 != crc) {

			ubi_warn("CRC error: calculated %#08x, must be %#08x",

				 crc1, crc);

drivers/net/eepro100.c

+6 −1
Original line number Diff line number Diff line
@@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev) 
	struct net_device *dev = pci_get_drvdata (pdev);

	struct speedo_private *sp = netdev_priv(dev);

	void __iomem *ioaddr = sp->regs;

	int rc;



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_enable_device(pdev);



	rc = pci_enable_device(pdev);

	if (rc)

		return rc;



	pci_set_master(pdev);



	if (!netif_running(dev))

CRA Git | Maintained and supported by SUSTech CRA and CCSE