Fix a build warning in virtio-ccw introduced during the merge window.

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUV1PXAAoJEN7Pa5PG8C+v4QoP/1cpSUhihF7dgIX6TyPegJBs
 K4uDknGpjbYhVmUp+L/qX7Radt30sUpBxEp7dJ33cmRyDAvZTfpdweJhYydxC932
 Ai91CwfwvWlgBZvSx5qjPH/JJoqMeFBQ5ckK+Tzp2FXOL25074FoHXLFAPhsqS8t
 zVW21hiy8t4ZgeB2dv+4RJxTA5Cwq/b0fyAB8y3fcfKhiEDcO7pImVLG4g2bo1iC
 dKDMIl0UpAww93AyHnIrkYKWXrfdHCM57hAc9pSCT2L3/ZVdznG+XZPmtIMjRlv5
 uzGbt+1WsJTWj0JGONaSnPQ7xVonQLcEtdWQDLwuobN1b634IGXIOHK/GAhf3Wbb
 23f12zRl+EHNmfMObjCuok9Xe6vwZ2yZvsGlfdrp6fP9wAVZd8pAKilnUT7W9jvR
 iDM9RxvYZut2wTsgJRQqWjCCNDlQuSSQ+rZahC+f7u2h6apWLxZdN4wOesm2Mw8S
 IdG2aS048WqDGnd56+zdBhrvtbdOj1kTGQsW0uDg2gYeP4UrPuVyRVcx6STbIvLb
 C/EpRI/AUX9fwcOEw7b8yvwkWglQKDyzqtm0PjaxNrwYivMUJya7bbJGI0FAAtsK
 CFjFHrnBe/PNn+BCs6DIm7AGq6okJcSYZQ15lyqvCdciG9SXTu0H/B6HHlCXpZa8
 AO3yT1uv4qDsKaHGJ6gt
 =0NzP
 -----END PGP SIGNATURE-----

Merge tag 'kvm-s390-20141103' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

Fix a build warning in virtio-ccw introduced during the merge window.
This commit is contained in:
Paolo Bonzini 2014-11-03 12:41:34 +01:00
commit bc79a3179a

View file

@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
int i;
struct virtqueue *vq;
struct virtio_driver *drv;
if (!vcdev)
return;